Commit 57de52c6 authored by Manvel Saroyan's avatar Manvel Saroyan

Issue 5631 - do not show disabled filters in more section

parent 58bc0280
......@@ -137,7 +137,7 @@
<p class="i18n_options_more_filters_description"></p>
</header>
<div>
<ul id="custom-list-table" class="table list">
<ul id="more-list-table" class="table list">
<template>
<label class="display"></label>
<button data-action="remove-subscription" class="i18n_options_control_remove_title link control" title="options_control_remove_title"></button>
......
......@@ -352,9 +352,9 @@
emptyText: ["options_dialog_language_other_empty"]
}
]);
collections.custom = new Collection([
collections.more = new Collection([
{
id: "custom-list-table"
id: "more-list-table"
}
]);
collections.whitelist = new Collection([
......@@ -372,12 +372,13 @@
function addSubscription(subscription)
{
let disabled = subscription.disabled;
let collection = null;
if (subscription.recommended)
{
if (subscription.recommended == "ads")
{
if (subscription.disabled == false)
if (disabled == false)
collection = collections.langs;
collections.allLangs.addItem(subscription);
......@@ -387,9 +388,9 @@
collection = collections.protection;
}
}
else if (!isAcceptableAds(subscription.url))
else if (!isAcceptableAds(subscription.url) && disabled == false)
{
collection = collections.custom;
collection = collections.more;
}
if (collection)
......@@ -415,12 +416,12 @@
{
if (subscription.disabled == false)
{
collections.custom.addItem(subscription);
collections.more.addItem(subscription);
updateTooltips();
}
else
{
collections.custom.removeItem(subscription);
collections.more.removeItem(subscription);
}
}
}
......@@ -1196,7 +1197,7 @@
}
else
{
collections.custom.removeItem(subscription);
collections.more.removeItem(subscription);
}
}
collections.filterLists.removeItem(subscription);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment