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

Merge branch '3.0'

Browse source
This commit is contained in:
Simon Kornblith 2012-06-27 22:39:47 -04:00
commit b9da94a650
1 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -467,6 +467,12 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
var row = this._itemRowMap[id]; var row = this._itemRowMap[id];
// Deleted items get a modify that we have to ignore when
// not viewing the trash
if (item.deleted) {
continue;
}
// Item already exists in this view // Item already exists in this view
if( row != null) if( row != null)
{ {
@ -505,12 +511,6 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
else if (((itemGroup.isLibrary() || itemGroup.isGroup()) && itemGroup.ref.libraryID == item.libraryID) else if (((itemGroup.isLibrary() || itemGroup.isGroup()) && itemGroup.ref.libraryID == item.libraryID)
|| (itemGroup.isCollection() && item.inCollection(itemGroup.ref.id))) { || (itemGroup.isCollection() && item.inCollection(itemGroup.ref.id))) {
// Deleted items get a modify that we have to ignore when
// not viewing the trash
if (item.deleted) {
continue;
}
// Otherwise the item has to be added // Otherwise the item has to be added
if(item.isRegularItem() || !item.getSource()) if(item.isRegularItem() || !item.getSource())
{ {
@ -531,11 +531,24 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
// If quicksearch, re-run it, since the results may have changed // If quicksearch, re-run it, since the results may have changed
else else
{ {
// If not viewing trash and all items were deleted, ignore modify
var allDeleted = true;
if (!itemGroup.isTrash()) {
var items = Zotero.Items.get(ids);
for each(var item in items) {
if (!item.deleted) {
allDeleted = false;
break;
}
}
}
if (!allDeleted) {
quicksearch.doCommand(); quicksearch.doCommand();
madeChanges = true; madeChanges = true;
sort = true; sort = true;
} }
} }
}
else if(action == 'add') else if(action == 'add')
{ {
// If saved search or trash, just re-run search // If saved search or trash, just re-run search
@ -617,7 +630,6 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
} }
} }
if (singleSelect) { if (singleSelect) {
if (sort) { if (sort) {
this.sort(typeof sort == 'number' ? sort : false); this.sort(typeof sort == 'number' ? sort : false);
@ -680,6 +692,18 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
} }
} }
else { else {
// If this was a child item and the next item at this
// position is a top-level item, move selection one row
// up to select a sibling or parent
if (ids.length == 1 && previousRow > 0) {
var previousItem = Zotero.Items.get(ids[0]);
if (previousItem && previousItem.getSource()) {
if (this._dataItems[previousRow] && this.getLevel(previousRow) == 0) {
previousRow--;
}
}
}
if (this._dataItems[previousRow]) { if (this._dataItems[previousRow]) {
this.selection.select(previousRow); this.selection.select(previousRow);
} }