diff --git a/chrome/chromeFiles/content/scholar/overlay.js b/chrome/chromeFiles/content/scholar/overlay.js index ef6c6ec745..33e99c40c9 100644 --- a/chrome/chromeFiles/content/scholar/overlay.js +++ b/chrome/chromeFiles/content/scholar/overlay.js @@ -264,6 +264,14 @@ var ScholarPane = new function() { if(itemsView && itemsView.selection.count > 0) { + if (itemsView._itemGroup.isCollection()){ + var noPrompt = true; + } + // Do nothing in search view + else if (itemsView._itemGroup.isSearch()){ + return; + } + var eraseChildren = {value: true}; var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); @@ -284,8 +292,8 @@ var ScholarPane = new function() } } } - - if (promptService.confirmCheck( + + if (noPrompt || promptService.confirmCheck( window, Scholar.getString('pane.items.delete.title'), Scholar.getString('pane.items.delete' + (itemsView.selection.count>1 ? '.multiple' : '')), diff --git a/chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js b/chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js index 254bec6585..4309b41729 100644 --- a/chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js +++ b/chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js @@ -562,7 +562,7 @@ Scholar.ItemTreeView.prototype.deleteSelection = function(eraseChildren) this._treebox.beginUpdateBatch(); for (var i=0; i