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

Fix error in in Error Conosle when clicking on some items

Browse source
This commit is contained in:
Dan Stillman 2013-02-22 18:41:49 -05:00
parent ab1d7a0f25
commit 937c0a3a3a
1 changed files with 77 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

145
chrome/content/zotero/zoteroPane.js
View file

@ -2380,11 +2380,11 @@ var ZoteroPane = new function()
return; return;
} }
var itemGroup = ZoteroPane_Local.collectionsView._getItemAtRow(row.value);
// Prevent the tree's select event from being called for a click
// on a library sync error icon
if (tree.id == 'zotero-collections-tree') { if (tree.id == 'zotero-collections-tree') {
let itemGroup = ZoteroPane_Local.collectionsView._getItemAtRow(row.value);
// Prevent the tree's select event from being called for a click
// on a library sync error icon
if (itemGroup.isLibrary(true)) { if (itemGroup.isLibrary(true)) {
if (col.value.id == 'zotero-collections-sync-status-column') { if (col.value.id == 'zotero-collections-sync-status-column') {
var libraryID = itemGroup.isLibrary() ? 0 : itemGroup.ref.libraryID; var libraryID = itemGroup.isLibrary() ? 0 : itemGroup.ref.libraryID;
@ -2399,37 +2399,41 @@ var ZoteroPane = new function()
// Automatically select all equivalent items when clicking on an item // Automatically select all equivalent items when clicking on an item
// in duplicates view // in duplicates view
else if (tree.id == 'zotero-items-tree' && itemGroup.isDuplicates()) { else if (tree.id == 'zotero-items-tree') {
// Trigger only on primary-button single clicks with modifiers let itemGroup = ZoteroPane_Local.getItemGroup();
// (so that items can still be selected and deselected manually)
if (!event || event.detail != 1 || event.button != 0 || event.metaKey || event.shiftKey) { if (itemGroup.isDuplicates()) {
return; // Trigger only on primary-button single clicks with modifiers
// (so that items can still be selected and deselected manually)
if (!event || event.detail != 1 || event.button != 0 || event.metaKey || event.shiftKey) {
return;
}
var t = event.originalTarget;
if (t.localName != 'treechildren') {
return;
}
var tree = t.parentNode;
var row = {}, col = {}, obj = {};
tree.treeBoxObject.getCellAt(event.clientX, event.clientY, row, col, obj);
// obj.value == 'cell'/'text'/'image'/'twisty'
if (!obj.value) {
return;
}
// Duplicated in itemTreeView.js::notify()
var itemID = ZoteroPane_Local.itemsView._getItemAtRow(row.value).ref.id;
var setItemIDs = itemGroup.ref.getSetItemsByItemID(itemID);
ZoteroPane_Local.itemsView.selectItems(setItemIDs);
// Prevent the tree's select event from being called here,
// since it's triggered by the multi-select
event.stopPropagation();
} }
var t = event.originalTarget;
if (t.localName != 'treechildren') {
return;
}
var tree = t.parentNode;
var row = {}, col = {}, obj = {};
tree.treeBoxObject.getCellAt(event.clientX, event.clientY, row, col, obj);
// obj.value == 'cell'/'text'/'image'/'twisty'
if (!obj.value) {
return;
}
// Duplicated in itemTreeView.js::notify()
var itemID = ZoteroPane_Local.itemsView._getItemAtRow(row.value).ref.id;
var setItemIDs = itemGroup.ref.getSetItemsByItemID(itemID);
ZoteroPane_Local.itemsView.selectItems(setItemIDs);
// Prevent the tree's select event from being called here,
// since it's triggered by the multi-select
event.stopPropagation();
} }
} }
@ -2452,32 +2456,34 @@ var ZoteroPane = new function()
if (row.value == -1) { if (row.value == -1) {
return; return;
} }
var itemGroup = ZoteroPane_Local.collectionsView._getItemAtRow(row.value);
// Show the error panel when clicking a library-specific if (tree.id == 'zotero-collections-tree') {
// sync error icon let itemGroup = ZoteroPane_Local.collectionsView._getItemAtRow(row.value);
if (itemGroup.isLibrary(true)) {
if (col.value.id == 'zotero-collections-sync-status-column') {
var libraryID = itemGroup.isLibrary() ? 0 : itemGroup.ref.libraryID;
var errors = Zotero.Sync.Runner.getErrors(libraryID);
if (!errors) {
return;
}
var panel = Zotero.Sync.Runner.updateErrorPanel(window.document, errors);
var anchor = document.getElementById('zotero-collections-tree-shim');
var x = {}, y = {}, width = {}, height = {};
tree.treeBoxObject.getCoordsForCellItem(row.value, col.value, 'image', x, y, width, height);
x = x.value + Math.round(width.value / 2);
y = y.value + height.value + 3;
panel.openPopup(anchor, "after_start", x, y, false, false);
}
return; // Show the error panel when clicking a library-specific
// sync error icon
if (itemGroup.isLibrary(true)) {
if (col.value.id == 'zotero-collections-sync-status-column') {
var libraryID = itemGroup.isLibrary() ? 0 : itemGroup.ref.libraryID;
var errors = Zotero.Sync.Runner.getErrors(libraryID);
if (!errors) {
return;
}
var panel = Zotero.Sync.Runner.updateErrorPanel(window.document, errors);
var anchor = document.getElementById('zotero-collections-tree-shim');
var x = {}, y = {}, width = {}, height = {};
tree.treeBoxObject.getCoordsForCellItem(row.value, col.value, 'image', x, y, width, height);
x = x.value + Math.round(width.value / 2);
y = y.value + height.value + 3;
panel.openPopup(anchor, "after_start", x, y, false, false);
}
return;
}
} }
// The Mozilla tree binding fires select() in mousedown(), // The Mozilla tree binding fires select() in mousedown(),
@ -2485,17 +2491,20 @@ var ZoteroPane = new function()
// what it expects (say, because multiple items had been // what it expects (say, because multiple items had been
// selected during mousedown(), as is the case in duplicates mode), // selected during mousedown(), as is the case in duplicates mode),
// it fires select() again. We prevent that here. // it fires select() again. We prevent that here.
else if (itemGroup.isDuplicates() && tree.id == 'zotero-items-tree') { else if (tree.id == 'zotero-items-tree') {
if (event.metaKey || event.shiftKey) { let itemGroup = ZoteroPane_Local.getItemGroup();
return; if (itemGroup.isDuplicates()) {
if (event.metaKey || event.shiftKey) {
return;
}
if (obj.value == 'twisty') {
return;
}
event.stopPropagation();
event.preventDefault();
} }
if (obj.value == 'twisty') {
return;
}
event.stopPropagation();
event.preventDefault();
} }
return; return;