From 4546089672f404e3f0fbf3715141532d427b6710 Mon Sep 17 00:00:00 2001 From: Aurimas Vinckevicius Date: Sun, 19 May 2013 21:01:50 -0500 Subject: [PATCH] Tweak duplicate view click behavior Allow ctrl/alt/shift click actions in duplicate view. (closes #324) Allow right-click behavior on single item/attachment selection. (closes #325) --- chrome/content/zotero/zoteroPane.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index 558fc4f0a3..06c2fee2a9 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -2445,9 +2445,10 @@ var ZoteroPane = new function() let itemGroup = ZoteroPane_Local.getItemGroup(); if (itemGroup.isDuplicates()) { - // Trigger only on primary-button single clicks with modifiers + // Trigger only on primary-button single clicks without modifiers // (so that items can still be selected and deselected manually) - if (!event || event.detail != 1 || event.button != 0 || event.metaKey || event.shiftKey) { + if (!event || event.detail != 1 || event.button != 0 || event.metaKey + || event.shiftKey || event.altKey || event.ctrlKey) { return; } @@ -2536,7 +2537,14 @@ var ZoteroPane = new function() else if (tree.id == 'zotero-items-tree') { let itemGroup = ZoteroPane_Local.getItemGroup(); if (itemGroup.isDuplicates()) { - if (event.metaKey || event.shiftKey) { + if (event.button == 0 && (event.metaKey || event.shiftKey + || event.altKey || event.ctrlKey)) { + return; + } + + // Allow right-click on single items/attachments + var items = ZoteroPane_Local.getSelectedItems(); + if (event.button != 0 && items.length == 1) { return; }