#39 Preferences converted to JSON

bobbyrne01 · Dec 5, 2013 · 6e8f94e · 6e8f94e
1 parent 4bc49c3
commit 6e8f94e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 35 deletions.
diff --git a/data/js/ConfirmPanel.js b/data/js/ConfirmPanel.js
@@ -26,19 +26,19 @@ var SaveTextToFile_Panel = {
 		save: function() {
 
 			// send path to file and file name back to addon code
-			var selectedPrefs = '{'
-				+'"fileName":"' + document.getElementById("fileName").value + '", '
-			    +'"pathToFile":"' + document.getElementById("pathToFile").value.replace(/\\/g,"\\\\") + '", '
-			    +'"datestamp":"' + document.getElementById("datestamp").checked + '", '
-			    +'"timestamp":"' + document.getElementById("timestamp").checked + '", '
-			    +'"datestampInLine":"' + document.getElementById("datestampInLine").checked + '", '
-			    +'"timestampInLine":"' + document.getElementById("timestampInLine").checked + '", '
-			    +'"lineSeparator":"' + document.getElementById("lineSeparator").checked + '", '
-			    +'"currentURL":"' + document.getElementById("currentURL").checked + '", '
-			    +'"pagenameForFilename":"' + document.getElementById("pagenameForFilename").checked + '", '
-			    +'"saveMode":"' + document.getElementById("saveMode").value + '", '
-			    +'"confirmPanel":"' + document.getElementById("confirmPanel").checked + '"'
-			    +'}';
+			var selectedPrefs = JSON.stringify({
+				fileName: document.getElementById("fileName").value,
+				pathToFile: document.getElementById("pathToFile").value,
+			    datestamp: document.getElementById("datestamp").checked,
+			    timestamp: document.getElementById("timestamp").checked,
+			    datestampInLine: document.getElementById("datestampInLine").checked,
+			    timestampInLine: document.getElementById("timestampInLine").checked,
+			    lineSeparator: document.getElementById("lineSeparator").checked,
+			    currentURL: document.getElementById("currentURL").checked,
+			    pagenameForFilename: document.getElementById("pagenameForFilename").checked,
+			    saveMode: document.getElementById("saveMode").value,
+			    confirmPanel: document.getElementById("confirmPanel").checked
+		    });
 
 			self.port.emit("save", selectedPrefs);
 		},

diff --git a/lib/Panel.js b/lib/Panel.js
@@ -38,15 +38,15 @@ exports.init = function() {
 
 			Preference.set('fileName', parsedPerfs.fileName);
 			Preference.set('pathToFile', parsedPerfs.pathToFile);
-			Preference.set('datestamp', parsedPerfs.datestamp === "true");
-			Preference.set('timestamp', parsedPerfs.timestamp === "true");
-			Preference.set('datestampInLine', parsedPerfs.datestampInLine === "true");
-			Preference.set('timestampInLine', parsedPerfs.timestampInLine === "true");
-			Preference.set('lineSeparator', parsedPerfs.lineSeparator === "true");
-			Preference.set('currentURL', parsedPerfs.currentURL === "true");
-			Preference.set('pagenameForFilename', parsedPerfs.pagenameForFilename === "true");
+			Preference.set('datestamp', parsedPerfs.datestamp);
+			Preference.set('timestamp', parsedPerfs.timestamp);
+			Preference.set('datestampInLine', parsedPerfs.datestampInLine);
+			Preference.set('timestampInLine', parsedPerfs.timestampInLine);
+			Preference.set('lineSeparator', parsedPerfs.lineSeparator);
+			Preference.set('currentURL', parsedPerfs.currentURL);
+			Preference.set('pagenameForFilename', parsedPerfs.pagenameForFilename);
 			Preference.set('saveMode', parseInt(parsedPerfs.saveMode));
-			Preference.set('confirmPanel', parsedPerfs.confirmPanel === "true");
+			Preference.set('confirmPanel', parsedPerfs.confirmPanel);
 
 			Chrome.saveTo(selectedText);
 			confirmation.hide();
@@ -67,19 +67,19 @@ exports.init = function() {
 
 function getPreferences() {
 
-	var prefs = '{'
-		+'"fileName":"' + Preference.get('fileName') + '", '
-	    +'"pathToFile":"' + File.getPathToFile().replace(/\\/g,"\\\\")  + '", '
-	    +'"datestamp":' + Preference.get('datestamp') + ', '
-	    +'"timestamp":' + Preference.get('timestamp') + ', '
-	    +'"datestampInLine":' + Preference.get('datestampInLine') + ', '
-	    +'"timestampInLine":' + Preference.get('timestampInLine') + ', '
-	    +'"lineSeparator":' + Preference.get('lineSeparator') + ', '
-	    +'"currentURL":' + Preference.get('currentURL') + ', '
-	    +'"pagenameForFilename":' + Preference.get('pagenameForFilename') + ', '
-	    +'"saveMode":' + Preference.get('saveMode') + ', '
-	    +'"confirmPanel":' + Preference.get('confirmPanel') + ''
-	    +'}';
+	var prefs = JSON.stringify({
+			fileName: Preference.get('fileName'),
+			pathToFile: File.getPathToFile(),
+		    datestamp: Preference.get('datestamp'),
+		    timestamp: Preference.get('timestamp'),
+		    datestampInLine: Preference.get('datestampInLine'),
+		    timestampInLine: Preference.get('timestampInLine'),
+		    lineSeparator: Preference.get('lineSeparator'),
+		    currentURL: Preference.get('currentURL'),
+		    pagenameForFilename: Preference.get('pagenameForFilename'),
+		    saveMode: Preference.get('saveMode'),
+		    confirmPanel: Preference.get('confirmPanel')
+	    });
 
 	confirmation.port.emit("prefs", prefs);
 }

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.1.6",
+  "version": "2.1.7",
   "permissions": {"private-browsing": true},
   "preferences": [{
     	"name": "fileName",