From 6c34b3c3c96756b6db7ff2f3a0394472d81cde3e Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Thu, 27 Jun 2019 08:16:18 -0400 Subject: [PATCH] Use "relax" instead of "toggle" Related issue: - https://github.com/uBlockOrigin/uBlock-issues/issues/371 --- platform/chromium/manifest.json | 4 ++-- platform/firefox/manifest.json | 4 ++-- platform/opera/manifest.json | 2 +- platform/webext/manifest.json | 4 ++-- src/js/background.js | 2 +- src/js/commands.js | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index e5d0b98d1..ec6d52683 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -21,8 +21,8 @@ "launch-logger": { "description": "__MSG_popupTipLog__" }, - "toggle-blocking-profile": { - "description": "__MSG_toggleBlockingProfile__" + "relax-blocking-mode": { + "description": "__MSG_relaxBlockingMode__" } }, "content_scripts": [ diff --git a/platform/firefox/manifest.json b/platform/firefox/manifest.json index 9e95fb902..d13a0e3cf 100644 --- a/platform/firefox/manifest.json +++ b/platform/firefox/manifest.json @@ -28,8 +28,8 @@ "launch-logger": { "description": "__MSG_popupTipLog__" }, - "toggle-blocking-profile": { - "description": "__MSG_toggleBlockingProfile__" + "relax-blocking-mode": { + "description": "__MSG_relaxBlockingMode__" } }, "content_scripts": [ diff --git a/platform/opera/manifest.json b/platform/opera/manifest.json index f39cf615f..d2717f482 100644 --- a/platform/opera/manifest.json +++ b/platform/opera/manifest.json @@ -22,7 +22,7 @@ "description": "__MSG_popupTipLog__" }, "toggle-blocking-profile": { - "description": "__MSG_toggleBlockingProfile__" + "description": "__MSG_relaxBlockingMode__" } }, "content_scripts": [ diff --git a/platform/webext/manifest.json b/platform/webext/manifest.json index ee0351f60..91edd301a 100644 --- a/platform/webext/manifest.json +++ b/platform/webext/manifest.json @@ -28,8 +28,8 @@ "launch-logger": { "description": "__MSG_popupTipLog__" }, - "toggle-blocking-profile": { - "description": "__MSG_toggleBlockingProfile__" + "relax-blocking-mode": { + "description": "__MSG_relaxBlockingMode__" } }, "content_scripts": [ diff --git a/src/js/background.js b/src/js/background.js index ff756ea43..516774261 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -42,7 +42,7 @@ const µBlock = (function() { // jshint ignore:line autoUpdateAssetFetchPeriod: 120, autoUpdateDelayAfterLaunch: 180, autoUpdatePeriod: 7, - blockingProfiles: '11111 11101 00001', + blockingProfiles: '11101 00001', cacheStorageAPI: 'unset', cacheStorageCompression: true, cacheControlForFirefox1376932: 'no-cache, no-store, must-revalidate', diff --git a/src/js/commands.js b/src/js/commands.js index 3b5abd05b..0707c8765 100644 --- a/src/js/commands.js +++ b/src/js/commands.js @@ -38,7 +38,7 @@ if ( µBlock.canUseShortcuts === false ) { return; } -const toggleBlockingProfile = function(tab) { +const relaxBlockingMode = function(tab) { if ( tab instanceof Object === false || tab.id <= 0 @@ -169,8 +169,8 @@ vAPI.commands.onCommand.addListener(command => { }); }); break; - case 'toggle-blocking-profile': - vAPI.tabs.get(null, toggleBlockingProfile); + case 'relax-blocking-mode': + vAPI.tabs.get(null, relaxBlockingMode); break; default: break;