mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix additional refresh bug when Advanced Search window is open

Browse source 
Follow-up to 89babf8832
This commit is contained in:
Dan Stillman 2017-10-01 00:23:08 -04:00
parent 699d5634e9
commit c0143300c4
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
chrome/content/zotero/xpcom/itemTreeView.js
View file

@ -138,7 +138,7 @@ Zotero.ItemTreeView.prototype.setTree = async function (treebox) {
this._refreshItemRowMap(); this._refreshItemRowMap();
// Add a keypress listener for expand/collapse // Add a keypress listener for expand/collapse
var tree = this._treebox.treeBody.parentNode; var tree = this._getTreeElement();
var self = this; var self = this;
var coloredTagsRE = new RegExp("^[1-" + Zotero.Tags.MAX_COLORED_TAGS + "]{1}$"); var coloredTagsRE = new RegExp("^[1-" + Zotero.Tags.MAX_COLORED_TAGS + "]{1}$");
var listener = function(event) { var listener = function(event) {
@ -1005,19 +1005,27 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
this._updateIntroText(); this._updateIntroText();
//this._treebox.endUpdateBatch(); //this._treebox.endUpdateBatch();
let selectPromise;
// If we made changes to the selection (including reselecting the same item, which will register as // If we made changes to the selection (including reselecting the same item, which will register as
// a selection when selectEventsSuppressed is set to false), wait for selection handlers to be run // a selection when selectEventsSuppressed is set to false), wait for a select event on the tree
// view (e.g., as triggered by itemsView.runListeners('select') in ZoteroPane::itemSelected())
// before returning. This guarantees that changes are reflected in the middle and right-hand panes // before returning. This guarantees that changes are reflected in the middle and right-hand panes
// before returning from the save transaction. // before returning from the save transaction.
if (reselect) { //
// If no onselect handler is set on the tree element, as is the case in the Advanced Search window,
// the select listeners never get called, so don't wait.
let selectPromise;
var tree = this._getTreeElement();
var hasOnSelectHandler = tree.getAttribute('onselect') != '';
if (reselect && hasOnSelectHandler) {
selectPromise = this.waitForSelect(); selectPromise = this.waitForSelect();
}
this.selection.selectEventsSuppressed = false; this.selection.selectEventsSuppressed = false;
if (reselect) {
Zotero.debug("Yielding for select promise"); // TEMP Zotero.debug("Yielding for select promise"); // TEMP
return selectPromise; return selectPromise;
} }
else {
this.selection.selectEventsSuppressed = false;
}
}); });
@ -1034,7 +1042,7 @@ Zotero.ItemTreeView.prototype.unregister = async function() {
this.listener = null; this.listener = null;
return; return;
} }
let tree = this._treebox.treeBody.parentNode; let tree = this._getTreeElement();
tree.removeEventListener('keypress', this.listener, false); tree.removeEventListener('keypress', this.listener, false);
this.listener = null; this.listener = null;
} }
@ -2599,6 +2607,11 @@ Zotero.ItemTreeView.prototype.onColumnPickerHidden = function (event) {
} }
Zotero.ItemTreeView.prototype._getTreeElement = function () {
return this._treebox.treeBody && this._treebox.treeBody.parentNode;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// ///
/// Command Controller: /// Command Controller: