#59 Handle newlines correctly for windows platforms

bobbyrne01 · Oct 2, 2014 · c0f5d7a · c0f5d7a
1 parent 4ec7f75
commit c0f5d7a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/lib/Chrome.js b/lib/Chrome.js
@@ -3,7 +3,8 @@ var {Cc,Ci,Cu,components} = require("chrome"),
 	Tab = require("./Tab"),
 	Notification = require("./Notification"),
 	Localisation = require("./Localisation"),
-	Panel = require("./Panel");
+	Panel = require("./Panel"),
+	System = require("./System");
 
 exports.getHomeDir = function() {
 
@@ -186,8 +187,13 @@ exports.saveTo = function(selectedText){
         	string += Tab.getURL() + '\n\n';
         }
 
+        var combinedString = string + selectedText;
 
-        var istream = converter.convertToInputStream(string + selectedText);
+        if (System.getPlatform().indexOf('win') >= 0){
+        	combinedString = ombinedString.replace(/[\n]/g, '\r\n');
+        }
+
+        var istream = converter.convertToInputStream(combinedString);
 
         // The last argument (the callback) is optional.
         NetUtil.asyncCopy(istream, ostream, function(status) {

diff --git a/lib/System.js b/lib/System.js
@@ -0,0 +1,11 @@
+var system = require("sdk/system")
+
+function getPlatform() {
+
+    return system.platform;
+}
+
+exports.getPlatform = function() {
+
+	return getPlatform();
+}
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "description": "Saves highlighted text to a file in a specified directory",
   "author": "Robert Byrne",
   "license": "GNU GPL v3",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "permissions": {"private-browsing": true},
   "preferences": [{
     	"name": "fileName",