Index: chrome/content/errors.html
===================================================================
--- a/chrome/content/errors.html
+++ b/chrome/content/errors.html
@@ -60,17 +60,17 @@
(/adblock/i.test(message.errorMessage) || /adblock/i.test(message.sourceName) ||
id && (message.errorMessage.indexOf(id) >= 0 || message.sourceName && message.sourceName.indexOf(id) >= 0)));
});
if (messages.length)
{
document.write("
Errors related to Adblock Plus:
");
- for each (let message in messages)
+ for (let message of messages)
{
let type = (message.flags & Components.interfaces.nsIScriptError.warningFlag ? "warning" : "error");
let html = "" + (type == "warning" ? "Warning:" : "Error:") + "
";
html += encodeHTML(message.errorMessage) + "
";
if (message.sourceLine)
html += "Source line: " + encodeHTML(message.sourceLine) + "
";
if (message.sourceName)
html += "Location: " + encodeHTML(message.sourceName) + " line " + message.lineNumber + "
";
Index: chrome/content/ui/composer.js
===================================================================
--- a/chrome/content/ui/composer.js
+++ b/chrome/content/ui/composer.js
@@ -141,17 +141,17 @@ function init()
E("domainRestriction").value = docDomain;
E("thirdParty").hidden = !thirdParty;
E("firstParty").hidden = thirdParty;
let typeGroup = E("typeGroup");
let defaultTypes = RegExpFilter.prototype.contentType & ~RegExpFilter.typeMap.DOCUMENT;
let isDefaultType = (RegExpFilter.typeMap[item.typeDescr] & defaultTypes) != 0;
- for each (let type in types)
+ for (let type of types)
{
if (type == Policy.type.ELEMHIDE)
continue;
let typeNode = document.createElement("checkbox");
typeNode.setAttribute("value", Policy.typeDescr[type].toLowerCase().replace(/\_/g, "-"));
typeNode.setAttribute("label", Policy.localizedDescr[type].toLowerCase());
Index: chrome/content/ui/filters-filterview.js
===================================================================
--- a/chrome/content/ui/filters-filterview.js
+++ b/chrome/content/ui/filters-filterview.js
@@ -642,19 +642,19 @@ var FilterView =
this.noFiltersDummy = {index: 0, filter: {text: this.boxObject.treeBody.getAttribute("noFiltersText"), dummy: true}};
this.editDummy = {filter: {text: ""}};
let atomService = Cc["@mozilla.org/atom-service;1"].getService(Ci.nsIAtomService);
let stringAtoms = ["col-filter", "col-enabled", "col-hitcount", "col-lasthit", "type-comment", "type-filterlist", "type-whitelist", "type-elemhide", "type-elemhideexception", "type-invalid"];
let boolAtoms = ["selected", "dummy", "slow", "disabled"];
this.atoms = {};
- for each (let atom in stringAtoms)
+ for (let atom of stringAtoms)
this.atoms[atom] = atomService.getAtom(atom);
- for each (let atom in boolAtoms)
+ for (let atom of boolAtoms)
{
this.atoms[atom + "-true"] = atomService.getAtom(atom + "-true");
this.atoms[atom + "-false"] = atomService.getAtom(atom + "-false");
}
let columns = this.boxObject.columns;
for (let i = 0; i < columns.length; i++)
if (columns[i].element.hasAttribute("sortDirection"))
Index: chrome/content/ui/filters-subscriptionview.js
===================================================================
--- a/chrome/content/ui/filters-subscriptionview.js
+++ b/chrome/content/ui/filters-subscriptionview.js
@@ -82,17 +82,17 @@ ListManager.prototype =
// Remove existing entries if any
while (this._list.firstChild)
this._list.removeChild(this._list.firstChild);
// Now add all subscriptions
let subscriptions = FilterStorage.subscriptions.filter(this._filter, this);
if (subscriptions.length)
{
- for each (let subscription in subscriptions)
+ for (let subscription of subscriptions)
this.addSubscription(subscription, null);
// Make sure first list item is selected after list initialization
Utils.runAsync(function()
{
this._list.selectItem(this._list.getItemAtIndex(this._list.getIndexOfFirstVisibleRow()));
}, this);
}
Index: chrome/content/ui/filters.js
===================================================================
--- a/chrome/content/ui/filters.js
+++ b/chrome/content/ui/filters.js
@@ -142,17 +142,17 @@ var Templater =
value = value ? "true" : "false";
attribute.value = value;
}
}
}
// Process tags - remove if condition is false, replace by their children
// if it is true
- for each (let node in conditionals)
+ for (let node of conditionals)
{
let fragment = document.createDocumentFragment();
let condition = node.getAttribute("condition");
if (condition == "false")
condition = false;
for (let i = 0; i < node.childNodes.length; i++)
{
let child = node.childNodes[i];
Index: chrome/content/ui/sendReport.js
===================================================================
--- a/chrome/content/ui/sendReport.js
+++ b/chrome/content/ui/sendReport.js
@@ -906,70 +906,70 @@ let issuesDataSource =
{
this.contentWnd = wnd;
this.whitelistFilter = Policy.isWindowWhitelisted(wnd);
if (!this.whitelistFilter && this.isEnabled)
{
// Find disabled filters in active subscriptions matching any of the requests
let disabledMatcher = new CombinedMatcher();
- for each (let subscription in FilterStorage.subscriptions)
+ for (let subscription of FilterStorage.subscriptions)
{
if (subscription.disabled)
continue;
- for each (let filter in subscription.filters)
+ for (let filter of subscription.filters)
if (filter instanceof BlockingFilter && filter.disabled)
disabledMatcher.add(filter);
}
let seenFilters = Object.create(null);
- for each (let request in requestsDataSource.origRequests)
+ for (let request of requestsDataSource.origRequests)
{
if (request.filter)
continue;
let filter = disabledMatcher.matchesAny(request.location, request.typeDescr, request.docDomain, request.thirdParty);
if (filter && !(filter.text in seenFilters))
{
this.disabledFilters.push(filter);
seenFilters[filter.text] = true;
}
}
// Find disabled subscriptions with filters matching any of the requests
let seenSubscriptions = Object.create(null);
- for each (let subscription in FilterStorage.subscriptions)
+ for (let subscription of FilterStorage.subscriptions)
{
if (!subscription.disabled)
continue;
disabledMatcher.clear();
- for each (let filter in subscription.filters)
+ for (let filter of subscription.filters)
if (filter instanceof BlockingFilter)
disabledMatcher.add(filter);
- for each (let request in requestsDataSource.origRequests)
+ for (let request of requestsDataSource.origRequests)
{
if (request.filter)
continue;
let filter = disabledMatcher.matchesAny(request.location, request.typeDescr, request.docDomain, request.thirdParty);
if (filter && !(subscription.url in seenSubscriptions))
{
this.disabledSubscriptions.push(subscription);
seenSubscriptions[subscription.text] = true;
break;
}
}
}
this.numSubscriptions = FilterStorage.subscriptions.filter(this.subscriptionFilter).length;
this.numAppliedFilters = 0;
- for each (let filter in filtersDataSource.origFilters)
+ for (let filter of filtersDataSource.origFilters)
{
if (filter instanceof WhitelistFilter)
continue;
this.numAppliedFilters++;
if (filter.subscriptions.some(function(subscription) subscription instanceof SpecialSubscription))
this.ownFilters.push(filter);
}
@@ -991,51 +991,51 @@ let issuesDataSource =
E("issuesNoFiltersBox").hidden = (type != "false positive" || this.numAppliedFilters > 0);
E("issuesNoSubscriptionsBox").hidden = (type != "false negative" || this.numAppliedFilters > 0 || this.numSubscriptions > 0);
E("issuesSubscriptionCountBox").hidden = (this.numSubscriptions < 5);
let ownFiltersBox = E("issuesOwnFilters");
if (this.ownFilters.length && !ownFiltersBox.firstChild)
{
let template = E("issuesOwnFiltersTemplate");
- for each (let filter in this.ownFilters)
+ for (let filter of this.ownFilters)
{
let element = template.cloneNode(true);
element.removeAttribute("id");
element.removeAttribute("hidden");
element.firstChild.setAttribute("value", filter.text);
element.firstChild.setAttribute("tooltiptext", filter.text);
element.abpFilter = filter;
ownFiltersBox.appendChild(element);
}
}
E("issuesOwnFiltersBox").hidden = (type != "false positive" || this.ownFilters.length == 0);
let disabledSubscriptionsBox = E("issuesDisabledSubscriptions");
if (this.disabledSubscriptions.length && !disabledSubscriptionsBox.firstChild)
{
let template = E("issuesDisabledSubscriptionsTemplate");
- for each (let subscription in this.disabledSubscriptions)
+ for (let subscription of this.disabledSubscriptions)
{
let element = template.cloneNode(true);
element.removeAttribute("id");
element.removeAttribute("hidden");
element.firstChild.setAttribute("value", subscription.title);
element.setAttribute("tooltiptext", subscription instanceof DownloadableSubscription ? subscription.url : subscription.title);
element.abpSubscription = subscription;
disabledSubscriptionsBox.appendChild(element);
}
}
E("issuesDisabledSubscriptionsBox").hidden = (type != "false negative" || this.disabledSubscriptions.length == 0);
let disabledFiltersBox = E("issuesDisabledFilters");
if (this.disabledFilters.length && !disabledFiltersBox.firstChild)
{
let template = E("issuesDisabledFiltersTemplate");
- for each (let filter in this.disabledFilters)
+ for (let filter of this.disabledFilters)
{
let element = template.cloneNode(true);
element.removeAttribute("id");
element.removeAttribute("hidden");
element.firstChild.setAttribute("value", filter.text);
element.setAttribute("tooltiptext", filter.text);
element.abpFilter = filter;
disabledFiltersBox.appendChild(element);
@@ -1114,17 +1114,17 @@ let issuesDataSource =
openDialog("subscriptionSelection.xul", "_blank", "chrome,centerscreen,modal,resizable,dialog=no", null, result);
if (!("url" in result))
return;
let subscriptionResults = [[result.url, result.title]];
if ("mainSubscriptionURL" in result)
subscriptionResults.push([result.mainSubscriptionURL, result.mainSubscriptionTitle]);
- for each (let [url, title] in subscriptionResults)
+ for (let [url, title] of subscriptionResults)
{
let subscription = Subscription.fromURL(url);
if (!subscription)
continue;
FilterStorage.addSubscription(subscription);
subscription.disabled = false;
Index: chrome/content/ui/sidebar.js
===================================================================
--- a/chrome/content/ui/sidebar.js
+++ b/chrome/content/ui/sidebar.js
@@ -150,22 +150,22 @@ function reloadDisabledFilters()
function reloadDisabledFiltersInternal()
{
reloadDisabledScheduled = false;
disabledMatcher.clear();
if (Prefs.enabled)
{
- for each (let subscription in FilterStorage.subscriptions)
+ for (let subscription of FilterStorage.subscriptions)
{
if (subscription.disabled)
continue;
- for each (let filter in subscription.filters)
+ for (let filter of subscription.filters)
if (filter instanceof RegExpFilter && filter.disabled)
disabledMatcher.add(filter);
}
}
treeView.updateFilters();
}
@@ -471,17 +471,17 @@ function handleDblClick(event)
}
/**
* Opens the item in a new tab.
*/
function openInTab(item, /**Event*/ event)
{
let items = (item ? [item] : treeView.getAllSelectedItems());
- for each (let item in items)
+ for (let item of items)
{
if (item && item.typeDescr != "ELEMHIDE")
UI.loadInBrowser(item.location, mainWin, event);
}
}
function doBlock() {
var item = treeView.getSelectedItem();
@@ -667,17 +667,17 @@ function detach(doDetach)
}
// Returns items size in the document if available
function getItemSize(item)
{
if (item.filter && !item.filter.disabled && item.filter instanceof BlockingFilter)
return null;
- for each (let node in item.nodes)
+ for (let node of item.nodes)
{
if (node instanceof HTMLImageElement && (node.naturalWidth || node.naturalHeight))
return [node.naturalWidth, node.naturalHeight];
else if (node instanceof HTMLElement && (node.offsetWidth || node.offsetHeight))
return [node.offsetWidth, node.offsetHeight];
}
return null;
}
@@ -797,19 +797,19 @@ var treeView = {
return;
this.boxObject = boxObject;
this.itemsDummy = boxObject.treeBody.getAttribute("noitemslabel");
this.whitelistDummy = boxObject.treeBody.getAttribute("whitelistedlabel");
var stringAtoms = ["col-address", "col-type", "col-filter", "col-state", "col-size", "col-docDomain", "col-filterSource", "state-regular", "state-filtered", "state-whitelisted", "state-hidden", "state-hiddenexception"];
var boolAtoms = ["selected", "dummy", "filter-disabled"];
var atomService = Cc["@mozilla.org/atom-service;1"].getService(Ci.nsIAtomService);
this.atoms = {};
- for each (let atom in stringAtoms)
+ for (let atom of stringAtoms)
this.atoms[atom] = atomService.getAtom(atom);
- for each (let atom in boolAtoms)
+ for (let atom of boolAtoms)
{
this.atoms[atom + "-true"] = atomService.getAtom(atom + "-true");
this.atoms[atom + "-false"] = atomService.getAtom(atom + "-false");
}
this.itemsDummyTooltip = Utils.getString("no_blocking_suggestions");
this.whitelistDummyTooltip = Utils.getString("whitelisted_page");
@@ -1139,17 +1139,17 @@ var treeView = {
this.itemToSelect = null;
}
else if (!scanComplete && this.selection.currentIndex >= 0) // Keep selected row visible while scanning
this.boxObject.ensureRowIsVisible(this.selection.currentIndex);
},
updateFilters: function()
{
- for each (let item in this.allData)
+ for (let item of this.allData)
{
if (item.filter instanceof RegExpFilter && item.filter.disabled)
delete item.filter;
if (!item.filter)
item.filter = disabledMatcher.matchesAny(item.location, item.typeDescr, item.docDomain, item.thirdParty);
}
this.refilter();
},