feat: Optionally Skip Confirmation Window (#30)

thanks nyfair
RossWang · Jul 13, 2018 · b1eaa3e · b1eaa3e
1 parent b675908
commit b1eaa3e
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 6 deletions.
diff --git a/App/_locales/en/messages.json b/App/_locales/en/messages.json
@@ -325,11 +325,21 @@
 		"description": ""
 	},
 
-	"OP_cmDownPanel": {
+	"OP_downPanel": {
 		"message": "Display Download Panel",
 		"description": ""
 	},
 
+	"OPN_downPanel": {
+		"message": "Whether to display a download panel for the download event trigger from the auto observer",
+		"description": ""
+	},
+
+	"OP_cmDownPanel": {
+		"message": "Display Download Panel (context menu)",
+		"description": ""
+	},
+
 	"OPN_cmDownPanel": {
 		"message": "Whether to display a download panel for the download event trigger from the context menu",
 		"description": ""

diff --git a/App/_locales/zh_CN/messages.json b/App/_locales/zh_CN/messages.json
@@ -326,13 +326,23 @@
 		"description": ""
 	},
 
+	"OP_downPanel": {
+		"message": "显示下载窗口",
+		"description": ""
+	},
+
+	"OPN_downPanel": {
+		"message": "自动启动的下载是否要下载窗口",
+		"description": ""
+	},
+
 	"OP_cmDownPanel": {
-		"message": "显示下载视窗",
+		"message": "显示下载窗口 (右键菜单)",
 		"description": ""
 	},
 
 	"OPN_cmDownPanel": {
-		"message": "从右键选单启动的下载是否要下载视窗",
+		"message": "从右键菜单启动的下载是否要下载窗口",
 		"description": ""
 	},
 

diff --git a/App/_locales/zh_TW/messages.json b/App/_locales/zh_TW/messages.json
@@ -326,11 +326,21 @@
 		"description": ""
 	},
 
-	"OP_cmDownPanel": {
+	"OP_downPanel": {
 		"message": "顯示下載視窗",
 		"description": ""
 	},
 
+	"OPN_downPanel": {
+		"message": "自動啟動的下載是否要下載視窗",
+		"description": ""
+	},
+
+	"OP_cmDownPanel": {
+		"message": "顯示下載視窗 (右鍵選單)",
+		"description": ""
+	},
+
 	"OPN_cmDownPanel": {
 		"message": "從右鍵選單啟動的下載是否要下載視窗",
 		"description": ""

diff --git a/App/common.js b/App/common.js
@@ -591,7 +591,14 @@ async function prepareDownload(d) {
 	details.fileSize = getFileSize(d);
 
 	// create download panel
-	downloadPanel(details);
+	browser.storage.local.get(config.command.guess, item => {
+		if (item.downPanel) {
+			downloadPanel(details);
+		}
+		else {
+			sendTo(details.url,details.fileName,"",details.requestHeaders,"1");
+		}
+	});
 
 	// avoid blank new tab
 	var getting = browser.tabs.query({

diff --git a/App/config.js b/App/config.js
@@ -20,6 +20,7 @@ config.command = {
 			chgLog: true,
 			badge: true,
 			cmDownPanel: true,
+			downPanel: true,
 			ua: false,
 			fileSizeLimit: 0,
 			typeFilterA: "",

diff --git a/App/data/options/general.html b/App/data/options/general.html
@@ -145,10 +145,19 @@
 		<tr>
 			<td data-message="OPN_badge" class="note">Display current active download count on top of the icon</td>
 		</tr>
+		<tr>
+			<td>
+				<input id="downPanel" style="margin-left: 0px; margin-top: 15px;" type="checkbox">
+				<label data-message="OP_downPanel" for="downPanel">Display Download Panel</label>
+			</td>
+		</tr>
+		<tr>
+			<td data-message="OPN_downPanel" class="note">Whether to display a download panel for the download event trigger from the auto observer</td>
+		</tr>
 		<tr>
 			<td>
 				<input id="cmDownPanel" style="margin-left: 0px; margin-top: 15px;" type="checkbox">
-				<label data-message="OP_cmDownPanel" for="cmDownPanel">Display Download Panel</label>
+				<label data-message="OP_cmDownPanel" for="cmDownPanel">Display Download Panel (context menu)</label>
 			</td>
 		</tr>
 		<tr>

diff --git a/App/data/options/general.js b/App/data/options/general.js
@@ -11,6 +11,7 @@ function save() {
 	const autoSet = document.getElementById('autoSet').checked;
 	const chgLog = document.getElementById('chgLog').checked;
 	const badge = document.getElementById('badge').checked;
+	const downPanel = document.getElementById('downPanel').checked;
 	const cmDownPanel = document.getElementById('cmDownPanel').checked;
 	const dpHeight = document.getElementById('dpHeight').value;
 	const dpWidth = document.getElementById('dpWidth').value;
@@ -28,6 +29,7 @@ function save() {
 		autoSet,
 		chgLog,
 		badge,
+		downPanel,
 		cmDownPanel,
 		dpHeight,
 		dpWidth
@@ -56,6 +58,7 @@ function restore() {
 		document.getElementById('chgLog').checked = prefs.chgLog;
 		document.getElementById('badge').checked = prefs.badge;
 		document.getElementById('cmDownPanel').checked = prefs.cmDownPanel;
+		document.getElementById('downPanel').checked = prefs.downPanel;
 	});
 	browser.storage.local.get(['dpWidth', 'dpHeight'], prefs => {
 		document.getElementById('dpWidth').value = prefs.dpWidth;