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

Fix two problems that occur when the tag selector is closed:

Browse Source 
- Items removed from collections remain in the center pane
- Adding an item while a collection is selected causes the Library to become selected
This commit is contained in:
Dan Stillman 2007-01-13 00:21:51 +00:00
parent cfb297dfeb
commit 2c1c8636e2
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
chrome/content/zotero/xpcom/itemTreeView.js
View File

@ -41,7 +41,7 @@ Zotero.ItemTreeView = function(itemGroup, sourcesOnly)
this._treebox = null; this._treebox = null;
this.refresh(); this.refresh();
this._unregisterID = Zotero.Notifier.registerObserver(this, 'item'); this._unregisterID = Zotero.Notifier.registerObserver(this, ['item', 'collection-item']);
} }
@ -110,10 +110,6 @@ Zotero.ItemTreeView.prototype.refresh = function()
*/ */
Zotero.ItemTreeView.prototype.notify = function(action, type, ids) Zotero.ItemTreeView.prototype.notify = function(action, type, ids)
{ {
if (type != 'item' && type != 'collection-item'){
return;
}
var madeChanges = false; var madeChanges = false;
this.selection.selectEventsSuppressed = true; this.selection.selectEventsSuppressed = true;
var savedSelection = this.saveSelection(); var savedSelection = this.saveSelection();
@ -128,6 +124,20 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids)
var quicksearch = this._treebox.treeBody.ownerDocument.getElementById('zotero-tb-search'); var quicksearch = this._treebox.treeBody.ownerDocument.getElementById('zotero-tb-search');
// 'collection-item' ids are in the form collectionID-itemID
if (type == 'collection-item') {
var splitIDs = [];
for each(var id in ids) {
var split = id.split('-');
// Not items not in this collection
if (split[0] != this._itemGroup.ref.getID()) {
continue;
}
splitIDs.push(split[1]);
}
ids = splitIDs;
}
if((action == 'remove' && !this._itemGroup.isLibrary()) || action == 'delete') if((action == 'remove' && !this._itemGroup.isLibrary()) || action == 'delete')
{ {
//Since a remove involves shifting of rows, we have to do it in order //Since a remove involves shifting of rows, we have to do it in order
@ -136,13 +146,11 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids)
var rows = new Array(); var rows = new Array();
for(var i=0, len=ids.length; i<len; i++) for(var i=0, len=ids.length; i<len; i++)
{ {
var removeID = (action == 'remove') ? ids[i].split('-')[1] : ids[i]; if (action == 'delete' || !this._itemGroup.ref.hasItem(ids[i])) {
if (action == 'delete' || !this._itemGroup.ref.hasItem(removeID)) {
// Row might already be gone (e.g. if this is a child and // Row might already be gone (e.g. if this is a child and
// 'modify' was sent to parent) // 'modify' was sent to parent)
if (this._itemRowMap[removeID] != undefined) { if (this._itemRowMap[ids[i]] != undefined) {
rows.push(this._itemRowMap[removeID]); rows.push(this._itemRowMap[ids[i]]);
} }
} }
} }