Index: options.js |
=================================================================== |
--- a/options.js |
+++ b/options.js |
@@ -134,17 +134,17 @@ function loadOptions() |
$("#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"); |
@@ -322,17 +322,17 @@ function startSubscriptionSelection(titl |
{ |
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; |
@@ -723,17 +723,17 @@ ext.onMessage.addListener(message => |
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; |