Refactor: move code around panel reopening into checkForReopenPanel()

(#18)
Infocatcher · Nov 21, 2014 · c1a6d93 · c1a6d93
1 parent bc7ebd5
commit c1a6d93
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/downloadsPanel.js b/downloadsPanel.js
@@ -205,21 +205,8 @@ var downloadsPanel = {
 	},
 
 	panelClick: function(e) {
-		var trg = e.originalTarget;
-		// See chrome://browser/content/downloads/downloads.js, DownloadsView.onDownloadClick()
-		if(
-			e.button == 0 && (
-				!trg.hasAttribute("oncommand") // => goDoCommand("downloadsCmd_open")
-					&& this.dpt.da.getDlNode(trg)
-					&& prefs.get("reopenPanel.openFile")
-				|| trg.classList.contains("downloadButton")
-					&& trg.classList.contains("downloadShow")
-					&& prefs.get("reopenPanel.openContainingFolder")
-			)
-		) {
-			this.reopenPanel(e.view);
-		}
-
+		if(e.button == 0)
+			this.checkForReopenPanel(e);
 		if(e.button != 1 || !prefs.get("middleClickToRemoveFromPanel"))
 			return;
 		var dlController = this.dpt.da.getDlController(e.target);
@@ -228,6 +215,20 @@ var downloadsPanel = {
 		this.dpt.da.removeFromPanel(dlController, prefs.get("middleClickToRemoveFromPanel.clearHistory"));
 		this.dpt.stopEvent(e);
 	},
+	checkForReopenPanel: function(e) {
+		var trg = e.originalTarget;
+		if(
+			// See chrome://browser/content/downloads/downloads.js, DownloadsView.onDownloadClick()
+			!trg.hasAttribute("oncommand") // => goDoCommand("downloadsCmd_open")
+				&& this.dpt.da.getDlNode(trg)
+				&& prefs.get("reopenPanel.openFile")
+			|| trg.classList.contains("downloadButton")
+				&& trg.classList.contains("downloadShow")
+				&& prefs.get("reopenPanel.openContainingFolder")
+		) {
+			this.reopenPanel(e.view);
+		}
+	},
 	reopenPanel: function(window) {
 		window.setTimeout(function() {
 			var stopTime = Date.now() + prefs.get("reopenPanel.delayFallback");