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

WIP: keep the selected collection in the search results, and make sure it is still selected afterwards.

Browse Source
This commit is contained in:
Georges Dupéron 2018-06-24 23:23:05 +02:00
parent 47f415e523
commit 6cda5c3922
1 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
chrome/content/zotero/xpcom/collectionTreeView.js
View File

@ -41,7 +41,8 @@ Zotero.CollectionTreeView = function()
this.itemTreeView = null; this.itemTreeView = null;
this.itemToSelect = null; this.itemToSelect = null;
this.hideSources = []; this.hideSources = [];
this._searchText = ''; this._searchCache = { searchText: '' };
this.selectedBeforeSearch = Zotero.Prefs.get('lastViewedFolder');
this._highlightedRows = {}; this._highlightedRows = {};
this._unregisterID = Zotero.Notifier.registerObserver( this._unregisterID = Zotero.Notifier.registerObserver(
@ -1090,12 +1091,13 @@ Zotero.CollectionTreeView.prototype.selectByID = Zotero.Promise.coroutine(functi
}); });
Zotero.CollectionTreeView.prototype.setSearch = Zotero.Promise.coroutine(function* (val) { Zotero.CollectionTreeView.prototype.setSearch = Zotero.Promise.coroutine(function* (val) {
this._searchText = val ? val : ''; this._searchCache = { searchText: val ? val : '' };
if (this.isContainerOpen(0)) { var selectedBeforeSearch = this.getSelectedCollection(true);
this._closeContainer(0); if (selectedBeforeSearch) { this.selectedBeforeSearch = 'C' + selectedBeforeSearch; }
this._rows[0].isOpen = false; this.collapseLibrary(Zotero.Libraries.userLibraryID);
} yield this.expandLibrary(Zotero.Libraries.userLibraryID, true);
this.toggleOpenState(0); this._refreshRowMap();
this.selection.select(this._rowMap[this.selectedBeforeSearch]);
}); });
/** /**
@ -1353,25 +1355,36 @@ Zotero.CollectionTreeView.prototype._expandRow = Zotero.Promise.coroutine(functi
// Add collections // Add collections
for (var i = 0, len = collections.length; i < len; i++) { for (var i = 0, len = collections.length; i < len; i++) {
flds = ""; // This function checks whether this collection or one of its descendandts is a search result.
for (field in collections[i]) { flds += ",\n " + field + " = " + collections[i][field]; } var that = this;
//alert(flds); var isSearchResult = function (collection) {
var searchInChildCollections = function (collection, str) { if (that._searchCache.hasOwnProperty(collection.id)) {
//alert(collection.name); return that._searchCache[collection.id];
if (collection.name.toLowerCase().indexOf(str) >= 0) { } else {
return true; if (that.selectedBeforeSearch == 'C' + collection.id) {
} // To avoid most bugs that could happen if the selected row is invisible,
else { // and to make things more practical when searching for a collection to which
var rcollections = collection.getChildCollections(); // one wants to add an item, we keep the selected collection visible.
for (var j = 0, jlen = rcollections.length; j < jlen; j++) { that._searchCache[collection.id] = true;
if (searchInChildCollections(rcollections[j], str)) { return true;
return true; } else if (collection.name.toLowerCase().indexOf(that._searchCache.searchText) >= 0) {
} that._searchCache[collection.id] = true;
return true;
}
else {
var rcollections = collection.getChildCollections();
for (var j = 0, jlen = rcollections.length; j < jlen; j++) {
if (isSearchResult(rcollections[j])) {
that._searchCache[collection.id] = true;
return true;
}
}
that._searchCache[collection.id] = false;
return false;
} }
return false;
} }
} };
if (searchInChildCollections(collections[i], this._searchText)) { if (isSearchResult(collections[i])) {
let beforeRow = row + 1 + newRows; let beforeRow = row + 1 + newRows;
this._addRowToArray( this._addRowToArray(
rows, rows,