[Pkg-mozext-commits] [adblock-plus] 23/41: Issue 2010 - Replace for-each loops with for-of loops
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 18:21:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit bdf9ef5009ea0c6fcd5a952e63da0b420fad0bb0
Author: Tom Schuster <tschuster at adblockplus.org>
Date: Sat Feb 28 13:43:02 2015 +0100
Issue 2010 - Replace for-each loops with for-of loops
---
chrome/content/errors.html | 2 +-
chrome/content/ui/composer.js | 2 +-
chrome/content/ui/filters-filterview.js | 4 ++--
chrome/content/ui/filters-subscriptionview.js | 2 +-
chrome/content/ui/filters.js | 2 +-
chrome/content/ui/sendReport.js | 22 +++++++++++-----------
chrome/content/ui/sidebar.js | 14 +++++++-------
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/chrome/content/errors.html b/chrome/content/errors.html
index 5c18929..24e05a5 100644
--- a/chrome/content/errors.html
+++ b/chrome/content/errors.html
@@ -65,7 +65,7 @@
{
document.write("<p>Errors related to Adblock Plus:</p>");
- for each (let message in messages)
+ for (let message of messages)
{
let type = (message.flags & Components.interfaces.nsIScriptError.warningFlag ? "warning" : "error");
let html = "<b>" + (type == "warning" ? "Warning:" : "Error:") + "</b><br>";
diff --git a/chrome/content/ui/composer.js b/chrome/content/ui/composer.js
index a99eaa9..98a38aa 100644
--- a/chrome/content/ui/composer.js
+++ b/chrome/content/ui/composer.js
@@ -146,7 +146,7 @@ function init()
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;
diff --git a/chrome/content/ui/filters-filterview.js b/chrome/content/ui/filters-filterview.js
index 8b38a90..524356f 100644
--- a/chrome/content/ui/filters-filterview.js
+++ b/chrome/content/ui/filters-filterview.js
@@ -647,9 +647,9 @@ var FilterView =
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");
diff --git a/chrome/content/ui/filters-subscriptionview.js b/chrome/content/ui/filters-subscriptionview.js
index 7f97a38..8fc26e5 100644
--- a/chrome/content/ui/filters-subscriptionview.js
+++ b/chrome/content/ui/filters-subscriptionview.js
@@ -87,7 +87,7 @@ ListManager.prototype =
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
diff --git a/chrome/content/ui/filters.js b/chrome/content/ui/filters.js
index b649f28..29a2e31 100644
--- a/chrome/content/ui/filters.js
+++ b/chrome/content/ui/filters.js
@@ -147,7 +147,7 @@ var Templater =
// Process <if> 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");
diff --git a/chrome/content/ui/sendReport.js b/chrome/content/ui/sendReport.js
index 124f111..c61dbbb 100644
--- a/chrome/content/ui/sendReport.js
+++ b/chrome/content/ui/sendReport.js
@@ -911,18 +911,18 @@ let issuesDataSource =
{
// 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;
@@ -937,17 +937,17 @@ let issuesDataSource =
// 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;
@@ -964,7 +964,7 @@ let issuesDataSource =
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;
@@ -996,7 +996,7 @@ let issuesDataSource =
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");
@@ -1013,7 +1013,7 @@ let issuesDataSource =
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");
@@ -1030,7 +1030,7 @@ let issuesDataSource =
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");
@@ -1119,7 +1119,7 @@ let issuesDataSource =
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)
diff --git a/chrome/content/ui/sidebar.js b/chrome/content/ui/sidebar.js
index cfb1841..0b49068 100644
--- a/chrome/content/ui/sidebar.js
+++ b/chrome/content/ui/sidebar.js
@@ -155,12 +155,12 @@ function reloadDisabledFiltersInternal()
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);
}
@@ -476,7 +476,7 @@ function handleDblClick(event)
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);
@@ -672,7 +672,7 @@ 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];
@@ -802,9 +802,9 @@ var treeView = {
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");
@@ -1144,7 +1144,7 @@ var treeView = {
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;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list