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

Remove merged items from duplicates view without regenerating list

Browse source
This commit is contained in:
Dan Stillman 2016-04-24 19:58:44 -04:00
parent 7cf0ff2683
commit bee32d1a51
3 changed files with 43 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/data/items.js
View file

@ -460,6 +460,9 @@ Zotero.Items = new function() {
item.save();
// Hack to remove master item from duplicates view without recalculating duplicates
Zotero.Notifier.trigger('removeDuplicatesMaster', 'item', item.id);
Zotero.DB.commitTransaction();
}

2
chrome/content/zotero/xpcom/duplicates.js
View file

@ -101,6 +101,8 @@ Zotero.Duplicates.prototype._getObjectFromID = function (id) {
Zotero.Duplicates.prototype._findDuplicates = function () {
Zotero.debug("Finding duplicates");
var start = Date.now();
var self = this;

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

@ -551,59 +551,49 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids, extraData)
this._treebox.beginUpdateBatch();
if ((action == 'remove' && !itemGroup.isLibrary(true))
|| action == 'delete' || action == 'trash') {
|| action == 'delete' || action == 'trash'
|| (action == 'removeDuplicatesMaster' && itemGroup.isDuplicates())) {
// Since a remove involves shifting of rows, we have to do it in order,
// so sort the ids by row
var rows = [];
for (var i=0, len=ids.length; i<len; i++) {
if (action == 'delete' || action == 'trash' || action == 'removeDuplicatesMaster' ||
!itemGroup.ref.hasItem(ids[i])) {
let row = this._itemRowMap[ids[i]];
// Row might already be gone (e.g. if this is a child and
// 'modify' was sent to parent)
if (row == undefined) {
continue;
}
rows.push(row);
// Remove child items of removed parents
if (this.isContainer(row) && this.isContainerOpen(row)) {
while (++row < this.rowCount && this.getLevel(row) > 0) {
rows.push(row);
}
}
}
}
if (rows.length > 0) {
rows.sort(function(a,b) { return a-b });
for(var i=0, len=rows.length; i<len; i++)
{
var row = rows[i];
if(row != null)
{
this._hideItem(row-i);
this._treebox.rowCountChanged(row-i,-1);
}
}
// On a delete in duplicates mode, just refresh rather than figuring
// out what to remove
if (itemGroup.isDuplicates()) {
previousRow = this._itemRowMap[ids[0]];
this.refresh();
madeChanges = true;
sort = true;
}
else {
// Since a remove involves shifting of rows, we have to do it in order,
// so sort the ids by row
var rows = [];
for (var i=0, len=ids.length; i<len; i++) {
if (action == 'delete' || action == 'trash' ||
!itemGroup.ref.hasItem(ids[i])) {
let row = this._itemRowMap[ids[i]];
// Row might already be gone (e.g. if this is a child and
// 'modify' was sent to parent)
if (row == undefined) {
continue;
}
rows.push(row);
// Remove child items of removed parents
if (this.isContainer(row) && this.isContainerOpen(row)) {
while (++row < this.rowCount && this.getLevel(row) > 0) {
rows.push(row);
}
}
}
}
if (rows.length > 0) {
rows.sort(function(a,b) { return a-b });
for(var i=0, len=rows.length; i<len; i++)
{
var row = rows[i];
if(row != null)
{
this._hideItem(row-i);
this._treebox.rowCountChanged(row-i,-1);
}
}
madeChanges = true;
sort = true;
}
}
}
else if (action == 'modify')
{