From 1208aea99b10767d8ae58500e0360e260e09d29e Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 20 Nov 2012 05:34:38 -0500 Subject: [PATCH] Fix double-click on attachments/notes when viewOnDoubleClick is false --- chrome/content/zotero/zoteroPane.js | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js index fafbe920ad..6579441db1 100644 --- a/chrome/content/zotero/zoteroPane.js +++ b/chrome/content/zotero/zoteroPane.js @@ -2633,22 +2633,25 @@ var ZoteroPane = new function() } } else if (tree.id == 'zotero-items-tree') { - // Expand/collapse on triple-click - if (!Zotero.Prefs.get('viewOnDoubleClick')) { - return; + var viewOnDoubleClick = Zotero.Prefs.get('viewOnDoubleClick'); + if (viewOnDoubleClick) { + // Expand/collapse on triple-click, though the double-click + // will still trigger + if (event.detail == 3) { + tree.view.toggleOpenState(tree.view.selection.currentIndex); + return; + } + + // Don't expand/collapse on double-click + event.stopPropagation(); } - if (event.detail == 3) { - tree.view.toggleOpenState(tree.view.selection.currentIndex); - return; - } - - // Don't expand/collapse on double-click - event.stopPropagation(); - if (tree.view && tree.view.selection.currentIndex > -1) { var item = ZoteroPane_Local.getSelectedItems()[0]; if (item) { + if (!viewOnDoubleClick && item.isRegularItem()) { + return; + } ZoteroPane_Local.viewItems([item], event); } }