Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: new-options.js

Issue 29338983: issue 3741 - Add "remove" option to list items in new options page (Closed)
Patch Set: Created June 21, 2016, 1:27 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « new-options.html ('k') | skin/new-options.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: new-options.js
===================================================================
--- a/new-options.js
+++ b/new-options.js
@@ -23,7 +23,7 @@
var filtersMap = Object.create(null);
var collections = Object.create(null);
var acceptableAdsUrl = null;
- var maxLabelId = 0;
+ var maxItemId = 0;
var getMessage = ext.i18n.getMessage;
var filterErrors =
{
@@ -101,12 +101,14 @@
{
var item = arguments[i];
var listItem = document.createElement("li");
+ var itemId = "item-" + (++maxItemId);
listItem.appendChild(document.importNode(template.content, true));
listItem.setAttribute("data-access", item.url || item.text);
+ listItem.setAttribute("id", itemId);
+ listItem.setAttribute("role", "section");
- var labelId = "label-" + (++maxLabelId);
var label = listItem.querySelector(".display");
- label.setAttribute("id", labelId);
+ label.setAttribute("for", itemId);
if (item.recommended && label.hasAttribute("data-tooltip"))
{
var tooltipId = label.getAttribute("data-tooltip");
@@ -114,19 +116,13 @@
label.setAttribute("data-tooltip", tooltipId);
}
- var control = listItem.querySelector(".control");
- if (control)
+ var controls = listItem.querySelectorAll(".control");
+ for (var k = 0; k < controls.length; k++)
{
- control.setAttribute("aria-labelledby", labelId);
- control.addEventListener("click", this.details[j].onClick, false);
-
- var role = control.getAttribute("role");
- if (role == "checkbox" && !label.hasAttribute("data-action"))
- {
- var controlId = "control-" + maxLabelId;
- control.setAttribute("id", controlId);
- label.setAttribute("for", controlId);
- }
+ controls[k].setAttribute("aria-labelledby", itemId);
+ if (controls[k].hasAttribute("title"))
+ controls[k].setAttribute("title",
+ getMessage(controls[k].getAttribute("title")))
Thomas Greiner 2016/06/22 10:26:13 Detail: Mind splitting that up into two separate s
saroyanm 2016/06/22 13:46:16 Done.
}
this._setEmpty(table, null);
@@ -194,14 +190,13 @@
var title = this._getItemTitle(item, i);
element.querySelector(".display").textContent = title;
- if (title)
+ if (this.details[i].searchable)
element.setAttribute("data-search", title.toLowerCase());
var control = element.querySelector(".control[role='checkbox']");
if (control)
{
control.setAttribute("aria-checked", item.disabled == false);
- if (item.url == acceptableAdsUrl && this.details[i].onClick ==
- toggleDisableSubscription)
+ if (item.url == acceptableAdsUrl && this == collections.filterLists)
control.setAttribute("disabled", true);
}
@@ -282,63 +277,17 @@
return true;
}
- function toggleRemoveSubscription(e)
- {
- e.preventDefault();
- var subscriptionUrl = findParentData(e.target, "access", false);
- if (e.target.getAttribute("aria-checked") == "true")
- {
- ext.backgroundPage.sendMessage({
- type: "subscriptions.remove",
- url: subscriptionUrl
- });
- }
- else
- addEnableSubscription(subscriptionUrl);
- }
-
- function toggleDisableSubscription(e)
- {
- e.preventDefault();
- var subscriptionUrl = findParentData(e.target, "access", false);
- ext.backgroundPage.sendMessage(
- {
- type: "subscriptions.toggle",
- keepInstalled: true,
- url: subscriptionUrl
- });
- }
-
- function onAddLanguageSubscriptionClick(e)
- {
- e.preventDefault();
- var url = findParentData(this, "access", false);
- addEnableSubscription(url);
- }
-
- function onRemoveFilterClick()
- {
- var filter = findParentData(this, "access", false);
- ext.backgroundPage.sendMessage(
- {
- type: "filters.remove",
- text: filter
- });
- }
-
collections.popular = new Collection(
[
{
- id: "recommend-list-table",
- onClick: toggleRemoveSubscription
+ id: "recommend-list-table"
}
]);
collections.langs = new Collection(
[
{
id: "blocking-languages-table",
- emptyText: "options_dialog_language_added_empty",
- onClick: toggleRemoveSubscription
+ emptyText: "options_dialog_language_added_empty"
},
{
id: "blocking-languages-dialog-table",
@@ -350,29 +299,26 @@
{
id: "all-lang-table",
emptyText: "options_dialog_language_other_empty",
- onClick: onAddLanguageSubscriptionClick
+ searchable: true
}
]);
collections.acceptableAds = new Collection(
[
{
- id: "acceptableads-table",
- onClick: toggleRemoveSubscription
+ id: "acceptableads-table"
}
]);
collections.custom = new Collection(
[
{
- id: "custom-list-table",
- onClick: toggleRemoveSubscription
+ id: "custom-list-table"
}
]);
collections.whitelist = new Collection(
[
{
id: "whitelisting-table",
- emptyText: "options_whitelisted_empty",
- onClick: onRemoveFilterClick
+ emptyText: "options_whitelisted_empty"
}
]);
collections.customFilters = new Collection(
@@ -386,7 +332,6 @@
[
{
id: "all-filter-lists-table",
- onClick: toggleDisableSubscription,
useOriginalTitle: true
}
]);
@@ -633,6 +578,36 @@
url: findParentData(element, "access", false)
});
break;
+ case "toggle-remove-subscription":
+ var subscriptionUrl = findParentData(element, "access", false);
+ if (element.getAttribute("aria-checked") == "true")
+ {
+ ext.backgroundPage.sendMessage({
+ type: "subscriptions.remove",
+ url: subscriptionUrl
+ });
+ }
+ else
+ addEnableSubscription(subscriptionUrl);
+ break;
+ case "toggle-disable-subscription":
+ ext.backgroundPage.sendMessage(
+ {
+ type: "subscriptions.toggle",
+ keepInstalled: true,
+ url: findParentData(element, "access", false)
+ });
+ break;
+ case "add-language-subscription":
+ addEnableSubscription(findParentData(element, "access", false));
+ break;
+ case "remove-filter":
+ ext.backgroundPage.sendMessage(
+ {
+ type: "filters.remove",
+ text: findParentData(element, "access", false)
+ });
+ break;
}
}
}
@@ -953,7 +928,6 @@
break;
case "removed":
var knownSubscription = subscriptionsMap[subscription.url];
-
if (subscription.url == acceptableAdsUrl || subscription.recommended)
{
subscription.disabled = true;
« no previous file with comments | « new-options.html ('k') | skin/new-options.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld