update backbone

Quicksaver · Feb 19, 2016 · f5821f5 · f5821f5
1 parent 26b08bc
commit f5821f5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/resource/modules/utils/preferencesUtils.jsm b/resource/modules/utils/preferencesUtils.jsm
@@ -1,4 +1,4 @@
-// VERSION 2.4.13
+// VERSION 2.4.14
 Modules.UTILS = true;
 
 // dependsOn - object that adds a dependson attribute functionality to xul preference elements.
@@ -1039,20 +1039,26 @@ this.controllers = {
 	},
 
 	showFilePicker: function(mode, prefix, aCallback) {
+		let fileExt = '.json';
 		let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
 		fp.defaultExtension = 'json';
 		fp.appendFilter('JSON data', '*.json');
 
 		if(mode == Ci.nsIFilePicker.modeSave) {
 			let date = new Date();
 			let dateStr = date.getFullYear()+'-'+(date.getMonth() +1)+'-'+date.getDate()+'-'+date.getHours()+'-'+date.getMinutes()+'-'+date.getSeconds();
-			fp.defaultString = prefix+'-'+dateStr;
+			fp.defaultString = prefix+'-'+dateStr+fileExt;
 		}
 
 		fp.init(window, null, mode);
 		fp.open(function(aResult) {
 			if(aResult != Ci.nsIFilePicker.returnCancel) {
-				aCallback(fp.file);
+				let aFile = fp.file;
+				// We always make sure we're saving a .json text file, so that it can be recognized and loaded by the add-on.
+				if(mode == Ci.nsIFilePicker.modeSave && !aFile.path.endsWith(fileExt)) {
+					aFile.initWithPath(aFile.path+fileExt);
+				}
+				aCallback(aFile);
 			}
 		});
 	},