Fixed can not use custom function in cancel

H1727512220 · Jul 3, 2019 · 1c8c353 · 1c8c353
1 parent 830b3a4
commit 1c8c353
Show file tree

Hide file tree

Showing 2 changed files with 927 additions and 927 deletions.
diff --git a/src/background.js b/src/background.js
@@ -103,7 +103,7 @@ browser.webRequest.onBeforeRequest.addListener(function(e) {
 		originUrl: e.originUrl || ''
 	};
 	for (const item of rule) {
-		if (item.action === 'cancel') {
+		if (item.action === 'cancel' && !item.isFunction) {
 			return { cancel: true };
 		} else {
 			if (item.isFunction) {
@@ -112,7 +112,7 @@ browser.webRequest.onBeforeRequest.addListener(function(e) {
 					if (typeof(r) === 'string') {
 						redirectTo = r;
 					}
-					if (r === '_header_editor_cancel_') {
+					if (r === '_header_editor_cancel_' || (item.action === 'cancel' && r === true)) {
 						return { "cancel": true };
 					}
 				} catch (e) {