www

commit 57603427e386179590f5f457e8e1eb4b3c3c4f15
parent ee798dde1684a4c98b7205dad590d83b5865e868
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun,  4 Dec 2016 14:18:43 -0500

Fix clicking Choose to select custom data dir when already set

Diffstat:
M
chrome/content/zotero/preferences/preferences_advanced.js
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/preferences/preferences_advanced.js b/chrome/content/zotero/preferences/preferences_advanced.js
@@ -239,12 +239,11 @@ Zotero_Preferences.Advanced = {
 	},
 	
 	
-	onDataDirUpdate: Zotero.Promise.coroutine(function* (event) {
+	onDataDirUpdate: Zotero.Promise.coroutine(function* (event, forceNew) {
 		var radiogroup = document.getElementById('data-dir');
-		var useDataDir = Zotero.Prefs.get('useDataDir');
 		var newUseDataDir = radiogroup.selectedIndex == 1;
 		
-		if (newUseDataDir && !this._usingDefaultDataDir()) {
+		if (!forceNew && newUseDataDir && !this._usingDefaultDataDir()) {
 			return;
 		}
 		
@@ -261,7 +260,7 @@ Zotero_Preferences.Advanced = {
 	
 	chooseDataDir: function(event) {
 		document.getElementById('data-dir').selectedIndex = 1;
-		//this.onDataDirUpdate(event);
+		this.onDataDirUpdate(event, true);
 	},