From 78f4a87e714d90a3669ca7181b9fd142ed7dbb6f Mon Sep 17 00:00:00 2001 From: jspenguin2017 Date: Tue, 5 Feb 2019 19:32:05 -0700 Subject: [PATCH] Resync patches --- patches/20_0_configuration_tweaks.patch | 6 +++--- patches/integration/10_2_extended_resources.patch | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/20_0_configuration_tweaks.patch b/patches/20_0_configuration_tweaks.patch index a537dac..1551828 100644 --- a/patches/20_0_configuration_tweaks.patch +++ b/patches/20_0_configuration_tweaks.patch @@ -1,8 +1,8 @@ diff --git a/src/js/assets.js b/src/js/assets.js -index 33f776a2..8c57ce57 100644 +index 333e2b31..bade272e 100644 --- a/src/js/assets.js +++ b/src/js/assets.js -@@ -313,7 +313,7 @@ const registerAssetSource = function(assetKey, dict) { +@@ -331,7 +331,7 @@ const registerAssetSource = function(assetKey, dict) { entry.contentURL = []; } if ( typeof entry.updateAfter !== 'number' ) { @@ -11,7 +11,7 @@ index 33f776a2..8c57ce57 100644 } if ( entry.submitter ) { entry.submitTime = Date.now(); // To detect stale entries -@@ -900,7 +900,7 @@ api.rmrf = function() { +@@ -918,7 +918,7 @@ api.rmrf = function() { // Asset updater area. var updaterStatus, updaterTimer, diff --git a/patches/integration/10_2_extended_resources.patch b/patches/integration/10_2_extended_resources.patch index 0470576..0a1cbad 100644 --- a/patches/integration/10_2_extended_resources.patch +++ b/patches/integration/10_2_extended_resources.patch @@ -1,8 +1,8 @@ diff --git a/src/js/assets.js b/src/js/assets.js -index c6f1410b..33f776a2 100644 +index a1a9e115..333e2b31 100644 --- a/src/js/assets.js +++ b/src/js/assets.js -@@ -952,6 +952,9 @@ var updateNext = function() { +@@ -970,6 +970,9 @@ var updateNext = function() { if ( assetKey === 'ublock-resources' && noRemoteResources ) { continue; }