From 4b6ce5e402c6029bd3d0d3b4c10e44d1bc7494c3 Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Sun, 12 Mar 2023 10:08:20 -0400 Subject: [PATCH] Cleanup unused code Related discussion: - https://github.com/uBlockOrigin/uBlock-issues/issues/1529 - https://github.com/uBlockOrigin/uBlock-issues/discussions/1958#discussioncomment-5257148 --- src/js/background.js | 1 - src/js/logger-ui.js | 3 --- src/js/messaging.js | 1 - src/js/start.js | 11 ----------- 4 files changed, 16 deletions(-) diff --git a/src/js/background.js b/src/js/background.js index 26ebe481e..0e8fcd951 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -63,7 +63,6 @@ const hiddenSettingsDefault = { cnameIgnoreRootDocument: true, cnameMaxTTL: 120, cnameReplayFullURL: false, - cnameUncloak: true, cnameUncloakProxied: false, consoleLogLevel: 'unset', debugScriptlets: false, diff --git a/src/js/logger-ui.js b/src/js/logger-ui.js index ef071e551..30e097d1f 100644 --- a/src/js/logger-ui.js +++ b/src/js/logger-ui.js @@ -52,7 +52,6 @@ let filteredLoggerEntryVoidedCount = 0; let popupLoggerBox; let popupLoggerTooltips; let activeTabId = 0; -let filterAuthorMode = false; let selectedTabId = 0; let netInspectorPaused = false; let cnameOfEnabled = false; @@ -1112,8 +1111,6 @@ const onLogBufferRead = function(response) { allTabIdsToken = response.tabIdsToken; } - filterAuthorMode = response.filterAuthorMode === true; - if ( activeTabIdChanged ) { pageSelectorFromURLHash(); } diff --git a/src/js/messaging.js b/src/js/messaging.js index 958bf62f6..fb9dd3d0e 100644 --- a/src/js/messaging.js +++ b/src/js/messaging.js @@ -1605,7 +1605,6 @@ const getLoggerData = async function(details, activeTabId, callback) { activeTabId, colorBlind: µb.userSettings.colorBlindFriendly, entries: logger.readAll(details.ownerId), - filterAuthorMode: µb.hiddenSettings.filterAuthorMode, tabIdsToken: µb.pageStoresToken, tooltips: µb.userSettings.tooltipsDisabled === false }; diff --git a/src/js/start.js b/src/js/start.js index b5438b5d2..52ab743e8 100644 --- a/src/js/start.js +++ b/src/js/start.js @@ -238,17 +238,6 @@ const onUserSettingsReady = fetched => { fetched.externalLists.trim().split(/[\n\r]+/); } - // https://github.com/uBlockOrigin/uBlock-issues/issues/1513 - // Transition nicely. - // TODO: remove when current version of uBO is well past 1.34.0. - if ( typeof µb.hiddenSettings.cnameUncloak === false ) { - fetched.cnameUncloakEnabled = false; - µb.hiddenSettings.cnameUncloak = true; - µb.saveHiddenSettings(); - } - µb.hiddenSettingsDefault.cnameUncloak = undefined; - µb.hiddenSettings.cnameUncloak = undefined; - fromFetch(µb.userSettings, fetched); if ( µb.privacySettingsSupported ) {