www

commit c7bbde3c4f6b421138399c5722878576e3dd0486
parent 5bceebf56cc70e82a3746dc75027d79f81849112
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 29 Nov 2016 03:28:49 -0500

Add default pref for quicksearch mode to avoid recreating during tests

Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
6
------
M
defaults/preferences/zotero.js
 | 
2
++

2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -1661,11 +1661,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 			Zotero.Prefs.set("search.quicksearch-mode", "fields");
 			mode = 'fields';
 		}
-		// TEMP -- pre-3.0b3
-		else if (modes[mode] == 'titlesAndCreators') {
-			Zotero.Prefs.set("search.quicksearch-mode", "titleCreatorYear");
-			mode = 'titleCreatorYear'
-		}
 		
 		var hbox = document.getAnonymousNodes(searchBox)[0];
 		var input = hbox.getElementsByAttribute('class', 'textbox-input')[0];
@@ -1673,7 +1668,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 		// Already initialized, so just update selection
 		var button = hbox.getElementsByAttribute('id', 'zotero-tb-search-menu-button');
 		if (button.length) {
-			Zotero.debug("already initialized search menu");
 			button = button[0];
 			var menupopup = button.firstChild;
 			for each(var menuitem in menupopup.childNodes) {
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
@@ -87,6 +87,8 @@ pref("extensions.zotero.keys.sync", 'Y');
 pref("extensions.zotero.keys.toggleAllRead", 'R');
 pref("extensions.zotero.keys.toggleRead", '`');
 
+pref("extensions.zotero.search.quicksearch-mode", "fields");
+
 // Fulltext indexing
 pref("extensions.zotero.fulltext.textMaxLength", 500000);
 pref("extensions.zotero.fulltext.pdfMaxPages", 100);