From 8d2319e0114b1892bece596ee41ebf4a39437acc Mon Sep 17 00:00:00 2001 From: gorhill Date: Fri, 26 May 2017 08:31:19 -0400 Subject: [PATCH] fix "purge all" button not disabled when there is nothing left to purge --- src/js/3p-filters.js | 5 ++++- src/js/utils.js | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/js/3p-filters.js b/src/js/3p-filters.js index 2cd1fc785..4739aadfa 100644 --- a/src/js/3p-filters.js +++ b/src/js/3p-filters.js @@ -276,7 +276,10 @@ var renderFilterLists = function(soft) { var renderWidgets = function() { uDom('#buttonApply').toggleClass('disabled', filteringSettingsHash === hashFromCurrentFromSettings()); - uDom('#buttonPurgeAll').toggleClass('disabled', document.querySelector('#lists .listEntry.cached') === null); + uDom('#buttonPurgeAll').toggleClass( + 'disabled', + document.querySelector('#lists .listEntry.cached:not(.obsolete)') === null + ); uDom('#buttonUpdate').toggleClass('disabled', document.querySelector('body:not(.updating) #lists .listEntry.obsolete > input[type="checkbox"]:checked') === null); }; diff --git a/src/js/utils.js b/src/js/utils.js index ec14bef2e..7d25d800c 100644 --- a/src/js/utils.js +++ b/src/js/utils.js @@ -75,13 +75,14 @@ return th; }, + // https://github.com/chrisaljoudi/uBlock/issues/1118 + // We limit to a maximum number of tokens. + _tokenize: function() { var tokens = this._tokens, url = this._urlOut, l = url.length; if ( l === 0 ) { tokens[0] = 0; return; } - // https://github.com/chrisaljoudi/uBlock/issues/1118 - // We limit to a maximum number of tokens. if ( l > 2048 ) { url = url.slice(0, 2048); l = 2048;