fix: filter setting cannot be saved(#31)

RossWang · Jun 27, 2018 · 1a37956 · 1a37956
1 parent a458682
commit 1a37956
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/App/common.js b/App/common.js
@@ -3,7 +3,7 @@
 var request = [];
 var globalD = [];
 var aggressive = false;
-var minFileSize = 0;
+var fileSizeLimit = 0;
 var fileTypeFilterA = "";
 var urlFilterA = "";
 var fileTypeFilterB = "";
@@ -131,9 +131,8 @@ function sendTo(url, fileName, filePath, header, server) {
 			else if(server == "2") {
 				browser.storage.local.get(config.command.s2, function(item) {
 					var secure = false;
-					if (item.protocol2.toLowerCase() == "https" || item.protocol2.toLowerCase() == "wss") {
+					if (item.protocol2.toLowerCase == "https" || item.protocol2.toLowerCase == "wss")
 						secure = true;
-					}
 					var options = {
 						host: item.host2,
 						port: item.port2,
@@ -235,9 +234,8 @@ function sendTo(url, fileName, filePath, header, server) {
 			else if(server == "3") {
 				browser.storage.local.get(config.command.s3, function(item) {
 					var secure = false;
-					if (item.protocol3.toLowerCase() == "https" || item.protocol3.toLowerCase() == "wss") {
+					if (item.protocol3.toLowerCase == "https" || item.protocol3.toLowerCase == "wss")
 						secure = true;
-					}
 					var options = {
 						host: item.host3,
 						port: item.port3,
@@ -524,7 +522,7 @@ function isException(d) {
 	// check Exception
 	var id = d.responseHeaders.findIndex(x => x.name.toLowerCase() === "content-length");
 	if(id != -1) {
-		if(d.responseHeaders[id].value < minFileSize){
+		if(d.responseHeaders[id].value < fileSizeLimit){
 			return true;
 		}
 	}
@@ -902,7 +900,7 @@ function loadSettings() {
 	browser.storage.local.get(config.command.guess, (item) => {
 		aggressive = item.aggressive;
 		contextMenus(item.menu, item.cmDownPanel);
-		minFileSize = item.minFileSize;
+		fileSizeLimit = item.fileSizeLimit;
 		fileTypeFilterA = item.typeFilterA;
 		urlFilterA = item.urlFilterA;
 		fileTypeFilterB = item.typeFilterB;

diff --git a/App/config.js b/App/config.js
@@ -21,7 +21,7 @@ config.command = {
 			badge: true,
 			cmDownPanel: true,
 			ua: false,
-			minFileSize: 0,
+			fileSizeLimit: 0,
 			typeFilterA: "",
 			urlFilterA: "",
 			typeFilterB: "",

diff --git a/App/data/options/exception.js b/App/data/options/exception.js
@@ -26,7 +26,7 @@ function save() {
 
 function restore() {
 	browser.storage.local.get(Object.assign(config.command.guess), prefs => {
-		document.getElementById('fileSizeLimit').value = prefs.minFileSize;
+		document.getElementById('fileSizeLimit').value = prefs.fileSizeLimit;
 		document.getElementById('typeFilterA').value = prefs.typeFilterA;
 		document.getElementById('typeFilterB').value = prefs.typeFilterB
 		document.getElementById('urlFilterA').value = prefs.urlFilterA;