Noissue - Rebase current master tip to edge bookmark

options.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 121 matching lines @@
   $("#acceptableAds").click(toggleAcceptableAds);
   $("#whitelistForm").submit(addWhitelistDomain);
   $("#removeWhitelist").click(removeSelectedExcludedDomain);
   $("#customFilterForm").submit(addTypedFilter);
   $("#removeCustomFilter").click(removeSelectedFilters);
   $("#rawFiltersButton").click(toggleFiltersInRawFormat);
   $("#importRawFilters").click(importRawFiltersText);
 
   // Display jQuery UI elements
   $("#tabs").tabs();
-  $("button").button();
+  $("button:not(.subscriptionRemoveButton)").button();
   $(".refreshButton").button("option", "icons", {primary: "ui-icon-refresh"});
   $(".addButton").button("option", "icons", {primary: "ui-icon-plus"});
   $(".removeButton").button("option", "icons", {primary: "ui-icon-minus"});
 
   // Popuplate option checkboxes
   initCheckbox("shouldShowBlockElementMenu");
   initCheckbox("show_devtools_panel");
   initCheckbox("shouldShowNotifications", "notifications_ignoredcategories");
 
   getInfo("features", features =>
@@ skipping 167 matching lines @@
 
 function startSubscriptionSelection(title, url)
 {
   let list = document.getElementById("subscriptionSelector");
   if (list.length == 0)
   {
     delayedSubscriptionSelection = [title, url];
     return;
   }
 
-  $("#tabs").tabs("select", 0);
+  $("#tabs").tabs("option", "active", 0);
   $("#addSubscriptionContainer").show();
   $("#addSubscriptionButton").hide();
   $("#subscriptionSelector").focus();
   if (typeof url != "undefined")
   {
     list.selectedIndex = list.length - 1;
     document.getElementById("customSubscriptionTitle").value = title;
     document.getElementById("customSubscriptionLocation").value = url;
   }
   updateSubscriptionSelection();
@@ skipping 380 matching lines @@
               "[data-section='" + message.args[0] + "']"
             );
             if (!found)
               continue;
 
             let previous = document.getElementsByClassName("focused");
             if (previous.length > 0)
               previous[0].classList.remove("focused");
 
             let index = $("[href='#" + tab.id + "']").parent().index();
-            $("#tabs").tabs("select", index);
+            $("#tabs").tabs("option", "active", index);
             found.classList.add("focused");
           }
           break;
       }
       break;
     case "filters.respond":
       onFilterMessage(message.action, message.args[0]);
       break;
     case "prefs.respond":
       onPrefMessage(message.action, message.args[0]);
       break;
     case "subscriptions.respond":
       onSubscriptionMessage(message.action, message.args[0]);
       break;
   }
 });