suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix middle pane status messages while using quick search

Browse Source
This commit is contained in:
Dan Stillman 2016-02-06 03:26:31 -05:00
parent 47e9f82927
commit 27de351615
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
chrome/content/zotero/zoteroPane.js
View File

@ -45,8 +45,6 @@ var ZoteroPane = new function()
this.handleKeyUp = handleKeyUp; this.handleKeyUp = handleKeyUp;
this.setHighlightedRowsCallback = setHighlightedRowsCallback; this.setHighlightedRowsCallback = setHighlightedRowsCallback;
this.handleKeyPress = handleKeyPress; this.handleKeyPress = handleKeyPress;
this.handleSearchKeypress = handleSearchKeypress;
this.handleSearchInput = handleSearchInput;
this.getSelectedCollection = getSelectedCollection; this.getSelectedCollection = getSelectedCollection;
this.getSelectedSavedSearch = getSelectedSavedSearch; this.getSelectedSavedSearch = getSelectedSavedSearch;
this.getSelectedItems = getSelectedItems; this.getSelectedItems = getSelectedItems;
@ -1962,45 +1960,33 @@ var ZoteroPane = new function()
var search = document.getElementById('zotero-tb-search'); var search = document.getElementById('zotero-tb-search');
if (search.value !== '') { if (search.value !== '') {
search.value = ''; search.value = '';
yield ZoteroPane_Local.search(); yield this.search();
return true; return true;
} }
return false; return false;
}); });
function handleSearchKeypress(textbox, event) { this.handleSearchKeypress = function (textbox, event) {
// Events that turn find-as-you-type on // Events that turn find-as-you-type on
if (event.keyCode == event.DOM_VK_ESCAPE) { if (event.keyCode == event.DOM_VK_ESCAPE) {
textbox.value = ''; textbox.value = '';
ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('searchInProgress')); this.search();
setTimeout(function () {
ZoteroPane_Local.search();
ZoteroPane_Local.clearItemsPaneMessage();
}, 1);
} }
else if (event.keyCode == event.DOM_VK_RETURN) { else if (event.keyCode == event.DOM_VK_RETURN) {
ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('searchInProgress')); this.search(true);
setTimeout(function () {
ZoteroPane_Local.search(true);
ZoteroPane_Local.clearItemsPaneMessage();
}, 1);
} }
} }
function handleSearchInput(textbox, event) { this.handleSearchInput = function (textbox, event) {
// This is the new length, except, it seems, when the change is a // This is the new length, except, it seems, when the change is a
// result of Undo or Redo // result of Undo or Redo
if (!textbox.value.length) { if (!textbox.value.length) {
ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('searchInProgress')); this.search();
setTimeout(function () {
ZoteroPane_Local.search();
ZoteroPane_Local.clearItemsPaneMessage();
}, 1);
} }
else if (textbox.value.indexOf('"') != -1) { else if (textbox.value.indexOf('"') != -1) {
ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('advancedSearchMode')); this.setItemsPaneMessage(Zotero.getString('advancedSearchMode'));
} }
} }
@ -2016,8 +2002,10 @@ var ZoteroPane = new function()
if (!runAdvanced && search.value.indexOf('"') != -1) { if (!runAdvanced && search.value.indexOf('"') != -1) {
return; return;
} }
this.setItemsPaneMessage(Zotero.getString('searchInProgress'));
var searchVal = search.value; var searchVal = search.value;
return this.itemsView.setFilter('search', searchVal); yield this.itemsView.setFilter('search', searchVal);
this.clearItemsPaneMessage();
}); });