resync patch NanoAdblocker/NanoCore#231

NanoAdblocker · Nov 27, 2018 · f5153a7 · f5153a7
1 parent 763b5c1
commit f5153a7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/patches/20_0_configuration_tweaks.patch b/patches/20_0_configuration_tweaks.patch
@@ -21,7 +21,7 @@ index b6821bbd..26bf4ada 100644
      updaterUpdated = [],
      updaterFetched = new Set(),
 diff --git a/src/js/background.js b/src/js/background.js
-index c40d3d63..1b39d3d1 100644
+index 17e5b034..88d5542e 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
 @@ -40,8 +40,8 @@ const µBlock = (function() { // jshint ignore:line
@@ -42,9 +42,9 @@ index c40d3d63..1b39d3d1 100644
 -        manualUpdateAssetFetchPeriod: 500,
 +        manualUpdateAssetFetchPeriod: 1,
          nanoIgnoreThirdPartyWhitelist: false,
+         nanoMakeThirdPartyFiltersPrivileged: false,
          nanoMakeUserFiltersPrivileged: false,
-         popupFontSize: 'unset',
-@@ -64,6 +64,7 @@ const µBlock = (function() { // jshint ignore:line
+@@ -65,6 +65,7 @@ const µBlock = (function() { // jshint ignore:line
          'chrome-extension-scheme',
          'chrome-scheme',
          'moz-extension-scheme',

diff --git a/patches/integration/10_1_compile_flags.patch b/patches/integration/10_1_compile_flags.patch
@@ -1,5 +1,5 @@
 diff --git a/src/js/background.js b/src/js/background.js
-index 2cf32f60..b3055cf3 100644
+index 2cf32f60..7aed8e34 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
 @@ -50,6 +50,9 @@ const µBlock = (function() { // jshint ignore:line
@@ -12,7 +12,7 @@ index 2cf32f60..b3055cf3 100644
          popupFontSize: 'unset',
          requestJournalProcessPeriod: 1000,
          strictBlockingBypassDuration: 120,
-@@ -155,6 +157,7 @@ const µBlock = (function() { // jshint ignore:line
+@@ -155,6 +158,7 @@ const µBlock = (function() { // jshint ignore:line
          assetsBootstrapLocation: 'assets/assets.json',
 
          userFiltersPath: 'user-filters',

diff --git a/patches/integration/30_1_editor_settings.patch b/patches/integration/30_1_editor_settings.patch
@@ -1,8 +1,8 @@
 diff --git a/src/js/background.js b/src/js/background.js
-index b3055cf3..c40d3d63 100644
+index 7aed8e34..17e5b034 100644
 --- a/src/js/background.js
 +++ b/src/js/background.js
-@@ -86,6 +86,8 @@ const µBlock = (function() { // jshint ignore:line
+@@ -87,6 +87,8 @@ const µBlock = (function() { // jshint ignore:line
              hyperlinkAuditingDisabled: true,
              ignoreGenericCosmeticFilters: false,
              largeMediaSize: 50,