Fix hang navigating by keyboard in Add Citation after switching views

https://forums.zotero.org/discussion/35658/
This commit is contained in:
Dan Stillman 2014-03-24 16:31:53 -04:00
parent af5e7abb31
commit fe1bedcb8d
2 changed files with 6 additions and 8 deletions

View file

@ -257,8 +257,7 @@ Zotero.ItemTreeView.prototype._setTreeGenerator = function(treebox)
})
.done();
};
// Store listener so we can call removeEventListener()
// in overlay.js::onCollectionSelected()
// Store listener so we can call removeEventListener() in ItemTreeView.unregister()
this.listener = listener;
tree.addEventListener('keypress', listener);
@ -911,6 +910,11 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
Zotero.ItemTreeView.prototype.unregister = function()
{
Zotero.Notifier.unregisterObserver(this._unregisterID);
if (this.listener) {
let tree = this._treebox.treeBody.parentNode;
tree.removeEventListener('keypress', this.listener, false);
this.listener = null;
}
}
////////////////////////////////////////////////////////////////////////////////

View file

@ -1107,12 +1107,6 @@ var ZoteroPane = new function()
if (this.itemsView)
{
this.itemsView.unregister();
if (this.itemsView.wrappedJSObject.listener) {
document.getElementById('zotero-items-tree').removeEventListener(
'keypress', this.itemsView.wrappedJSObject.listener, false
);
}
this.itemsView.wrappedJSObject.listener = null;
document.getElementById('zotero-items-tree').view = this.itemsView = null;
}