Remove widget replacement toggle

Part of #3007

Author: ghostwords

src/_locales/en_US/messages.json

@@ -491,10 +491,6 @@
         "message": "When blocking social buttons and other potentially useful (video, audio, comments) widgets, Privacy Badger can replace them with click-to-activate placeholders.",
         "description": "Introduction to the Widget Replacement tab on the options page"
     },
-    "options_social_widgets_checkbox": {
-        "message": "Enable widget replacement",
-        "description": "Checkbox label on the Widget Replacement tab"
-    },
     "options_widget_exceptions_header": {
         "message": "Widget Exceptions",
         "description": "Header text on the Widget Replacement tab"

src/js/background.js

@@ -768,7 +768,6 @@ Badger.prototype = {
     showExpandedTrackingSection: false,
     showIntroPage: true,
     showNonTrackingDomains: false,
-    socialWidgetReplacementEnabled: true,
     widgetReplacementExceptions: [],
     widgetSiteAllowlist: {},
   },
@@ -845,6 +844,7 @@ Badger.prototype = {
         "migrationLevel",
         "preventWebRTCIPLeak",
         "showTrackingDomains",
+        "socialWidgetReplacementEnabled",
         "webRTCIPProtection",
       ].forEach(item => {
         if (settings.hasItem(item)) { settings.deleteItem(item); }

src/js/options.js

@@ -113,9 +113,6 @@ function loadOptions() {
   $("#removeAllData").button("option", "icons", {primary: "ui-icon-closethick"});
   $("#show_counter_checkbox").on("click", updateShowCounter);
   $("#show_counter_checkbox").prop("checked", OPTIONS_DATA.settings.showCounter);
-  $("#replace-widgets-checkbox")
-    .on("click", updateWidgetReplacement)
-    .prop("checked", OPTIONS_DATA.settings.socialWidgetReplacementEnabled);
   $("#enable_dnt_checkbox").on("click", updateDNTCheckboxClicked);
   $("#enable_dnt_checkbox").prop("checked", OPTIONS_DATA.settings.sendDNTSignal);
   $("#check_dnt_policy_checkbox").on("click", updateCheckingDNTPolicy);
@@ -264,23 +261,6 @@ function loadOptions() {
 
   const $widgetExceptions = $("#hide-widgets-select");
 
-  // disable Widget Replacement form elements when widget replacement is off
-  function _disable_widget_forms(enable) {
-    if (enable) {
-      $widgetExceptions.prop("disabled", false);
-      $("#widget-site-exceptions-select").prop("disabled", false);
-      $('#widget-site-exceptions-remove-button').button("option", "disabled", false);
-    } else {
-      $widgetExceptions.prop("disabled", "disabled");
-      $("#widget-site-exceptions-select").prop("disabled", "disabled");
-      $('#widget-site-exceptions-remove-button').button("option", "disabled", true);
-    }
-  }
-  _disable_widget_forms(OPTIONS_DATA.settings.socialWidgetReplacementEnabled);
-  $("#replace-widgets-checkbox").on("change", function () {
-    _disable_widget_forms($(this).is(":checked"));
-  });
-
   // Initialize Select2 and populate options
   $widgetExceptions.select2({
     width: '100%'
@@ -295,12 +275,6 @@ function loadOptions() {
   $widgetExceptions.on('select2:unselect', updateWidgetReplacementExceptions);
   $widgetExceptions.on('select2:clear', updateWidgetReplacementExceptions);
 
-  // hide the deprecated widget replacement toggle
-  // unless the user previously checked it
-  if (!OPTIONS_DATA.settings.socialWidgetReplacementEnabled) {
-    $('#widget-replacement-toggle').show();
-  }
-
   reloadDisabledSites();
   reloadTrackingDomainsTab();
   reloadWidgetSiteExceptions();
@@ -467,19 +441,6 @@ function updateShowCounter() {
   });
 }
 
-/**
- * Update setting for whether or not to replace
- * social buttons/video players/commenting widgets.
- */
-function updateWidgetReplacement() {
-  const socialWidgetReplacementEnabled = $("#replace-widgets-checkbox").prop("checked");
-
-  chrome.runtime.sendMessage({
-    type: "updateSettings",
-    data: { socialWidgetReplacementEnabled }
-  });
-}
-
 /**
  * Update DNT checkbox clicked
  */

src/js/webrequest.js

@@ -179,7 +179,7 @@ function onBeforeRequest(details) {
 
     if (utils.hasOwn(surrogates.WIDGET_SURROGATES, request_host)) {
       let settings = badger.getSettings();
-      if (settings.getItem("socialWidgetReplacementEnabled") && !settings.getItem('widgetReplacementExceptions').includes(surrogates.WIDGET_SURROGATES[request_host].widgetName)) {
+      if (!settings.getItem('widgetReplacementExceptions').includes(surrogates.WIDGET_SURROGATES[request_host].widgetName)) {
         surrogate = surrogates.getSurrogateUri(url, request_host);
       }
 
@@ -625,19 +625,17 @@ function hideBlockedFrame(tab_id, parent_frame_id, frame_url, frame_host) {
   }
 
   // don't hide widget frames
-  if (badger.getSettings().getItem("socialWidgetReplacementEnabled")) {
-    let exceptions = badger.getSettings().getItem('widgetReplacementExceptions');
-    for (let widget of badger.widgetList) {
-      if (exceptions.includes(widget.name)) {
-        continue;
-      }
-      for (let domain of widget.domains) {
-        if (domain == frame_host) {
+  let exceptions = badger.getSettings().getItem('widgetReplacementExceptions');
+  for (let widget of badger.widgetList) {
+    if (exceptions.includes(widget.name)) {
+      continue;
+    }
+    for (let domain of widget.domains) {
+      if (domain == frame_host) {
+        return;
+      } else if (domain[0] == "*") { // leading wildcard domain
+        if (frame_host.endsWith(domain.slice(1))) {
           return;
-        } else if (domain[0] == "*") { // leading wildcard domain
-          if (frame_host.endsWith(domain.slice(1))) {
-            return;
-          }
         }
       }
     }
@@ -1370,8 +1368,7 @@ function dispatcher(request, sender, sendResponse) {
     let response = false,
       tab_host = extractHostFromURL(sender.tab.url);
 
-    if (badger.isPrivacyBadgerEnabled(tab_host) &&
-        badger.getSettings().getItem("socialWidgetReplacementEnabled")) {
+    if (badger.isPrivacyBadgerEnabled(tab_host)) {
       response = getWidgetList(sender.tab.id);
       response.frameId = sender.frameId;
     }

src/skin/options.html

@@ -254,12 +254,6 @@ <h4 class="i18n_options_advanced_settings"></h4>
 
   <div id="tab-manage-widgets">
     <p><span class="i18n_options_widget_replacement_desc"></span></p>
-    <p id="widget-replacement-toggle" style="display:none">
-    <label>
-      <input type="checkbox" id="replace-widgets-checkbox">
-      <span class="i18n_options_social_widgets_checkbox"></span>
-    </label>
-    </p>
 
     <h4 class="i18n_options_widget_exceptions_header"></h4>