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

Fix ordering of notifier events

Browse Source 
I'm not sure this matters -- since it was broken, itemTreeView notify()
code probably accounts for situations where, say, a 'modify' comes in
before an 'add' -- but it might avoid some edge cases in the future.
This commit is contained in:
Dan Stillman 2016-04-22 21:13:01 -04:00
parent d974206d65
commit 1e5090579b
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
chrome/content/zotero/xpcom/notifier.js
View File

@ -338,22 +338,33 @@ Zotero.Notifier = new function(){
var runQueue = []; var runQueue = [];
function sorter(a, b) { // Sort using order from array, unless missing, in which case sort after
return order.indexOf(b) - order.indexOf(a); var getSorter = function (orderArray) {
return function (a, b) {
var posA = orderArray.indexOf(a);
var posB = orderArray.indexOf(b);
if (posA == -1) posA = 100;
if (posB == -1) posB = 100;
return posA - posB;
} }
var order = ['collection', 'search', 'item', 'collection-item', 'item-tag', 'tag']; };
_queue.sort();
var typeOrder = ['collection', 'search', 'item', 'collection-item', 'item-tag', 'tag'];
var eventOrder = ['add', 'modify', 'remove', 'move', 'delete', 'trash'];
var queueTypes = Object.keys(_queue);
queueTypes.sort(getSorter(typeOrder));
var order = ['add', 'modify', 'remove', 'move', 'delete', 'trash'];
var totals = ''; var totals = '';
for (var type in _queue) { for (let type of queueTypes) {
if (!runQueue[type]) { if (!runQueue[type]) {
runQueue[type] = []; runQueue[type] = [];
} }
_queue[type].sort(); let typeEvents = Object.keys(_queue[type]);
typeEvents.sort(getSorter(eventOrder));
for (var event in _queue[type]) { for (let event of typeEvents) {
runQueue[type][event] = { runQueue[type][event] = {
ids: [], ids: [],
data: _queue[type][event].data data: _queue[type][event].data