www

commit bdd7bd9beb6436b9bea9b168a7bff269449c8384
parent 249e8fa857cc5a13fcf50def24764a12b7dec18a
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 15 Oct 2009 00:34:59 +0000

- Fix UI issue with search box when text is entered (probably)
- Restore Fx3.0 quick search code


Diffstat:
M
chrome/content/zotero/overlay.js
 | 
4
+++-
M
chrome/content/zotero/overlay.xul
 | 
5
++++-

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
@@ -1489,7 +1489,9 @@ var ZoteroPane = new function()
 			var searchVal = search.value;
 			this.itemsView.setFilter('search', searchVal);
 			
-			document.getElementById('zotero-tb-search-cancel').hidden = searchVal == "";
+			if (Zotero.isFx30) {
+				document.getElementById('zotero-tb-search-cancel').hidden = searchVal == "";
+			}
 		}
 		
 	}
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
@@ -243,7 +243,10 @@
 					<label id="zotero-tb-search-label" value="&zotero.toolbar.search.label;" control="zotero-tb-search" hidden="true"/>
 					<textbox id="zotero-tb-search" type="search" timeout="250" command="cmd_zotero_search" dir="reverse"
 						onkeypress="ZoteroPane.handleSearchKeypress(this, event)"
-						oninput="ZoteroPane.handleSearchInput(this, event)">
+						oninput="ZoteroPane.handleSearchInput(this, event)"
+						testcode="me.value.indexOf('&quot;') == -1"
+						prefire="ZoteroPane.clearItemsPaneMessage()"
+						ontestfail="ZoteroPane.setItemsPaneMessage(Zotero.getString('advancedSearchMode'))">
 						<toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 					</textbox>
 				</hbox>