[Pkg-mozext-commits] [adblock-plus] 25/74: Issue 2257 - Replaced non-standard function expressions with ES6 arrow functions
David Prévot
taffit at moszumanska.debian.org
Tue Aug 11 12:07:07 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 c94b3b935a04128148d9208d8393449d6e76e776
Author: Sebastian Noack <sebastian at adblockplus.org>
Date: Wed Apr 1 16:24:07 2015 +0200
Issue 2257 - Replaced non-standard function expressions with ES6 arrow functions
---
chrome/content/ui/composer.js | 6 ++---
chrome/content/ui/filters-backup.js | 4 +--
chrome/content/ui/filters-filteractions.js | 26 +++++++++---------
chrome/content/ui/filters-filterview.js | 34 ++++++++++++------------
chrome/content/ui/filters-search.js | 2 +-
chrome/content/ui/filters-subscriptionactions.js | 2 +-
chrome/content/ui/filters-subscriptionview.js | 8 +++---
chrome/content/ui/flasher.js | 2 +-
chrome/content/ui/sendReport.js | 8 +++---
chrome/content/ui/sidebar.js | 16 +++++------
chrome/content/ui/subscriptionSelection.js | 4 +--
11 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/chrome/content/ui/composer.js b/chrome/content/ui/composer.js
index 98a38aa..d4e1f16 100644
--- a/chrome/content/ui/composer.js
+++ b/chrome/content/ui/composer.js
@@ -162,7 +162,7 @@ function init()
if (item.type == type)
typeNode.setAttribute("disabled", "true");
- typeNode.addEventListener("command", function() checkboxUpdated(this), false);
+ typeNode.addEventListener("command", () => checkboxUpdated(typeNode), false);
typeGroup.appendChild(typeNode);
}
@@ -255,8 +255,8 @@ function updateFilter()
if (options.length)
{
- options.sort(function(a, b) a[0] - b[0]);
- filter += "$" + options.map(function(o) o[1]).join(",");
+ options.sort((a, b) => a[0] - b[0]);
+ filter += "$" + options.map(o => o[1]).join(",");
}
}
else
diff --git a/chrome/content/ui/filters-backup.js b/chrome/content/ui/filters-backup.js
index 10ba5ad..3b7d26c 100644
--- a/chrome/content/ui/filters-backup.js
+++ b/chrome/content/ui/filters-backup.js
@@ -193,7 +193,7 @@ var Backup =
if (Utils.confirm(window, warning, E("backupButton").getAttribute("_restoreDialogTitle")))
{
- let subscriptions = FilterStorage.subscriptions.filter(function(s) s instanceof SpecialSubscription);
+ let subscriptions = FilterStorage.subscriptions.filter(s => s instanceof SpecialSubscription);
for (let i = 0; i < subscriptions.length; i++)
FilterStorage.removeSubscription(subscriptions[i]);
@@ -290,7 +290,7 @@ var Backup =
*/
backupCustomFilters: function(/**nsIFile*/ file)
{
- let subscriptions = FilterStorage.subscriptions.filter(function(s) s instanceof SpecialSubscription);
+ let subscriptions = FilterStorage.subscriptions.filter(s => s instanceof SpecialSubscription);
let minVersion = "2.0"
let list = [];
for (let i = 0; i < subscriptions.length; i++)
diff --git a/chrome/content/ui/filters-filteractions.js b/chrome/content/ui/filters-filteractions.js
index 2a78e56..ee4f9b6 100644
--- a/chrome/content/ui/filters-filteractions.js
+++ b/chrome/content/ui/filters-filteractions.js
@@ -101,9 +101,9 @@ var FilterActions =
fillActionsPopup: function()
{
let editable = FilterView.editable;
- let items = FilterView.selectedItems.filter(function(i) !i.filter.dummy);
- items.sort(function(entry1, entry2) entry1.index - entry2.index);
- let activeItems = items.filter(function(i) i.filter instanceof ActiveFilter);
+ let items = FilterView.selectedItems.filter(i => !i.filter.dummy);
+ items.sort((entry1, entry2) => entry1.index - entry2.index);
+ let activeItems = items.filter(i => i.filter instanceof ActiveFilter);
E("filters-edit-command").setAttribute("disabled", !editable || !items.length);
E("filters-delete-command").setAttribute("disabled", !editable || !items.length);
@@ -142,7 +142,7 @@ var FilterActions =
if (this.treeElement.editingColumn)
return;
- let items = FilterView.selectedItems.filter(function(i) i.filter instanceof ActiveFilter);
+ let items = FilterView.selectedItems.filter(i => i.filter instanceof ActiveFilter);
if (items.length)
{
FilterView.boxObject.beginUpdateBatch();
@@ -205,7 +205,7 @@ var FilterActions =
deleteItems: function(/**Array*/ items)
{
let oldIndex = FilterView.selection.currentIndex;
- items.sort(function(entry1, entry2) entry2.index - entry1.index);
+ items.sort((entry1, entry2) => entry2.index - entry1.index);
for (let i = 0; i < items.length; i++)
FilterStorage.removeFilter(items[i].filter, FilterView._subscription, items[i].index);
@@ -236,9 +236,9 @@ var FilterActions =
if (this.treeElement.editingColumn)
return;
- let items = FilterView.selectedItems.filter(function(i) i.filter instanceof ActiveFilter);
+ let items = FilterView.selectedItems.filter(i => i.filter instanceof ActiveFilter);
if (items.length)
- FilterStorage.resetHitCounts(items.map(function(i) i.filter));
+ FilterStorage.resetHitCounts(items.map(i => i.filter));
},
/**
@@ -253,7 +253,7 @@ var FilterActions =
if (offset < 0)
{
- items.sort(function(entry1, entry2) entry1.index - entry2.index);
+ items.sort((entry1, entry2) => entry1.index - entry2.index);
let position = items[0].index + offset;
if (position < 0)
return;
@@ -264,7 +264,7 @@ var FilterActions =
}
else if (offset > 0)
{
- items.sort(function(entry1, entry2) entry2.index - entry1.index);
+ items.sort((entry1, entry2) => entry2.index - entry1.index);
let position = items[0].index + offset;
if (position >= FilterView.rowCount)
return;
@@ -408,8 +408,8 @@ var FilterActions =
if (!items.length)
return;
- items.sort(function(entry1, entry2) entry1.index - entry2.index);
- let text = items.map(function(i) i.filter.text).join(IO.lineBreak);
+ items.sort((entry1, entry2) => entry1.index - entry2.index);
+ let text = items.map(i => i.filter.text).join(IO.lineBreak);
Utils.clipboardHelper.copyString(text);
if (!keep && FilterView.editable && !this.treeElement.editingColumn)
@@ -465,8 +465,8 @@ var FilterActions =
if (!items.length)
return;
- items.sort(function(entry1, entry2) entry1.index - entry2.index);
- event.dataTransfer.setData("text/plain", items.map(function(i) i.filter.text).join(IO.lineBreak));
+ items.sort((entry1, entry2) => entry1.index - entry2.index);
+ event.dataTransfer.setData("text/plain", items.map(i => i.filter.text).join(IO.lineBreak));
this.dragItems = items;
event.stopPropagation();
},
diff --git a/chrome/content/ui/filters-filterview.js b/chrome/content/ui/filters-filterview.js
index 524356f..10bb9c4 100644
--- a/chrome/content/ui/filters-filterview.js
+++ b/chrome/content/ui/filters-filterview.js
@@ -502,7 +502,7 @@ var FilterView =
let oldCount = this.rowCount;
if (this._subscription && this._subscription.filters.length)
{
- this.data = this._subscription.filters.map(function(f, i) ({index: i, filter: f}));
+ this.data = this._subscription.filters.map((f, i) => ({index: i, filter: f}));
if (this.sortProc)
{
// Hide comments in the list, they should be sorted like the filter following them
@@ -830,20 +830,20 @@ var FilterView =
filter.disabled = !filter.disabled;
},
- isContainer: function(row) false,
- isContainerOpen: function(row) false,
- isContainerEmpty: function(row) true,
- getLevel: function(row) 0,
- getParentIndex: function(row) -1,
- hasNextSibling: function(row, afterRow) false,
- toggleOpenState: function(row) {},
- getProgressMode: function() null,
- getImageSrc: function() null,
- isSeparator: function() false,
- performAction: function() {},
- performActionOnRow: function() {},
- performActionOnCell: function() {},
- getCellValue: function() null,
- setCellValue: function() {},
- selectionChanged: function() {},
+ isContainer: row => false,
+ isContainerOpen: row => false,
+ isContainerEmpty: row => true,
+ getLevel: row => 0,
+ getParentIndex: row => -1,
+ hasNextSibling: (row, afterRow) => false,
+ toggleOpenState: row => {},
+ getProgressMode: () => null,
+ getImageSrc: () => null,
+ isSeparator: () => false,
+ performAction: () => {},
+ performActionOnRow: () => {},
+ performActionOnCell: () => {},
+ getCellValue: () => null,
+ setCellValue: () => {},
+ selectionChanged: () => {}
};
diff --git a/chrome/content/ui/filters-search.js b/chrome/content/ui/filters-search.js
index 86df86f..7c728d0 100644
--- a/chrome/content/ui/filters-search.js
+++ b/chrome/content/ui/filters-search.js
@@ -90,7 +90,7 @@ var FilterSearch =
// Now go through the other subscriptions
let result = Ci.nsITypeAheadFind.FIND_FOUND;
let subscriptions = FilterStorage.subscriptions.slice();
- subscriptions.sort(function(s1, s2) (s1 instanceof SpecialSubscription) - (s2 instanceof SpecialSubscription));
+ subscriptions.sort((s1, s2) => (s1 instanceof SpecialSubscription) - (s2 instanceof SpecialSubscription));
let current = subscriptions.indexOf(FilterView.subscription);
direction = direction || 1;
for (let i = current + direction; ; i+= direction)
diff --git a/chrome/content/ui/filters-subscriptionactions.js b/chrome/content/ui/filters-subscriptionactions.js
index abef18d..0d7a21b 100644
--- a/chrome/content/ui/filters-subscriptionactions.js
+++ b/chrome/content/ui/filters-subscriptionactions.js
@@ -49,7 +49,7 @@ var SubscriptionActions =
let node = null;
let tabIndex = -1;
let subscriptions = filter.subscriptions.slice();
- subscriptions.sort(function(s1, s2) s1.disabled - s2.disabled);
+ subscriptions.sort((s1, s2) => s1.disabled - s2.disabled);
for (let i = 0; i < subscriptions.length; i++)
{
let subscription = subscriptions[i];
diff --git a/chrome/content/ui/filters-subscriptionview.js b/chrome/content/ui/filters-subscriptionview.js
index 74e3265..ea836ab 100644
--- a/chrome/content/ui/filters-subscriptionview.js
+++ b/chrome/content/ui/filters-subscriptionview.js
@@ -167,7 +167,7 @@ ListManager.prototype =
_onChange: function(action, item, param1, param2)
{
if ((action == "subscription.added" || action == "subscription.removed") && item.url == Prefs.subscriptions_exceptionsurl)
- E("acceptableAds").checked = FilterStorage.subscriptions.some(function(s) s.url == Prefs.subscriptions_exceptionsurl);
+ E("acceptableAds").checked = FilterStorage.subscriptions.some(s => s.url == Prefs.subscriptions_exceptionsurl);
if (action == "filter.disabled")
{
@@ -287,13 +287,13 @@ ListManager.init = function()
{
new ListManager(E("subscriptions"),
E("subscriptionTemplate"),
- function(s) s instanceof RegularSubscription && !(ListManager.acceptableAdsCheckbox && s.url == Prefs.subscriptions_exceptionsurl),
+ s => s instanceof RegularSubscription && !(ListManager.acceptableAdsCheckbox && s.url == Prefs.subscriptions_exceptionsurl),
SubscriptionActions.updateCommands);
new ListManager(E("groups"),
E("groupTemplate"),
- function(s) s instanceof SpecialSubscription,
+ s => s instanceof SpecialSubscription,
SubscriptionActions.updateCommands);
- E("acceptableAds").checked = FilterStorage.subscriptions.some(function(s) s.url == Prefs.subscriptions_exceptionsurl);
+ E("acceptableAds").checked = FilterStorage.subscriptions.some(s => s.url == Prefs.subscriptions_exceptionsurl);
E("acceptableAds").parentNode.hidden = !ListManager.acceptableAdsCheckbox;
};
diff --git a/chrome/content/ui/flasher.js b/chrome/content/ui/flasher.js
index 69f4c9e..8b10f4f 100644
--- a/chrome/content/ui/flasher.js
+++ b/chrome/content/ui/flasher.js
@@ -28,7 +28,7 @@ var flasher = {
{
this.stop();
if (nodes)
- nodes = nodes.filter(function(node) node.nodeType == Node.ELEMENT_NODE);
+ nodes = nodes.filter(node => node.nodeType == Node.ELEMENT_NODE);
if (!nodes || !nodes.length)
return;
diff --git a/chrome/content/ui/sendReport.js b/chrome/content/ui/sendReport.js
index c61dbbb..ef3e8d1 100644
--- a/chrome/content/ui/sendReport.js
+++ b/chrome/content/ui/sendReport.js
@@ -263,7 +263,7 @@ let filtersDataSource =
let hitCount = wndStats.filters[f];
appendElement(filters, "filter", {
text: filter.text,
- subscriptions: filter.subscriptions.filter(subscriptionsDataSource.subscriptionFilter).map(function(s) s.url).join(" "),
+ subscriptions: filter.subscriptions.filter(subscriptionsDataSource.subscriptionFilter).map(s => s.url).join(" "),
hitCount: hitCount
});
this.origFilters.push(filter);
@@ -296,7 +296,7 @@ let subscriptionsDataSource =
let subscriptionXML = appendElement(subscriptions, "subscription", {
id: subscription.url,
- disabledFilters: subscription.filters.filter(function(filter) filter instanceof ActiveFilter && filter.disabled).length
+ disabledFilters: subscription.filters.filter(filter => filter instanceof ActiveFilter && filter.disabled).length
});
if (subscription.version)
subscriptionXML.setAttribute("version", subscription.version);
@@ -818,7 +818,7 @@ let subscriptionUpdateDataSource =
let filtersRemoved = false;
let requests = requestsDataSource.origRequests;
for (let i = 0; i < requests.length; i++)
- if (requests[i].filter && !requests[i].filter.subscriptions.filter(function(s) !s.disabled).length)
+ if (requests[i].filter && !requests[i].filter.subscriptions.filter(s => !s.disabled).length)
filtersRemoved = true;
if (filtersRemoved)
@@ -970,7 +970,7 @@ let issuesDataSource =
continue;
this.numAppliedFilters++;
- if (filter.subscriptions.some(function(subscription) subscription instanceof SpecialSubscription))
+ if (filter.subscriptions.some(subscription => subscription instanceof SpecialSubscription))
this.ownFilters.push(filter);
}
}
diff --git a/chrome/content/ui/sidebar.js b/chrome/content/ui/sidebar.js
index 0b49068..580a267 100644
--- a/chrome/content/ui/sidebar.js
+++ b/chrome/content/ui/sidebar.js
@@ -395,7 +395,7 @@ function fillInContext(/**Event*/ e)
menuItem.setAttribute("label", menuItem.getAttribute("labeltempl").replace(/\?1\?/, filter.text));
menuItem.hidden = false;
- if (filter instanceof ActiveFilter && !filter.disabled && filter.subscriptions.length && !filter.subscriptions.some(function(subscription) !(subscription instanceof SpecialSubscription)))
+ if (filter instanceof ActiveFilter && !filter.disabled && filter.subscriptions.length && !filter.subscriptions.some(subscription => !(subscription instanceof SpecialSubscription)))
{
let domain = null;
try {
@@ -526,7 +526,7 @@ function disableOnSite()
{
let item = treeView.getSelectedItem();
let filter = item.filter;
- if (!(filter instanceof ActiveFilter) || filter.disabled || !filter.subscriptions.length || filter.subscriptions.some(function(subscription) !(subscription instanceof SpecialSubscription)))
+ if (!(filter instanceof ActiveFilter) || filter.disabled || !filter.subscriptions.length || filter.subscriptions.some(subscription => !(subscription instanceof SpecialSubscription)))
return;
let domain;
@@ -552,7 +552,7 @@ function disableOnSite()
let match = /^DOMAIN=(.*)/.exec(options[i]);
if (match)
{
- let domains = match[1].split("|").filter(function(d) d != domain && d != "~" + domain && (d.length <= domain.length || d.lastIndexOf("." + domain) != d.length - domain.length - 1));
+ let domains = match[1].split("|").filter(d => d != domain && d != "~" + domain && (d.length <= domain.length || d.lastIndexOf("." + domain) != d.length - domain.length - 1));
domains.push("~" + domain);
options[i] = "DOMAIN=" + domains.join("|");
found = true;
@@ -573,7 +573,7 @@ function disableOnSite()
if (match)
{
let selector = match[2];
- let domains = match[1].toUpperCase().split(",").filter(function(d) d != domain && (d.length <= domain.length || d != "~" + domain && d.lastIndexOf("." + domain) != d.length - domain.length - 1));
+ let domains = match[1].toUpperCase().split(",").filter(d => d != domain && (d.length <= domain.length || d != "~" + domain && d.lastIndexOf("." + domain) != d.length - domain.length - 1));
domains.push("~" + domain);
text = domains.join(",").toLowerCase() + selector;
}
@@ -591,7 +591,7 @@ function disableOnSite()
else if (!newFilter.subscriptions.length)
{
newFilter.disabled = false;
- let subscription = filter.subscriptions.filter(function(s) s instanceof SpecialSubscription)[0];
+ let subscription = filter.subscriptions.filter(s => s instanceof SpecialSubscription)[0];
if (subscription)
FilterStorage.addFilter(newFilter, subscription, subscription.filters.indexOf(filter));
}
@@ -749,8 +749,8 @@ function compareDocDomain(item1, item2)
function compareFilterSource(item1, item2)
{
- let subs1 = item1.filter ? item1.filter.subscriptions.map(function(s) s.title).join(", ") : "";
- let subs2 = item2.filter ? item2.filter.subscriptions.map(function(s) s.title).join(", ") : "";
+ let subs1 = item1.filter ? item1.filter.subscriptions.map(s => s.title).join(", ") : "";
+ let subs2 = item2.filter ? item2.filter.subscriptions.map(s => s.title).join(", ") : "";
if (subs1 < subs2)
return -1;
else if (subs1 > subs2)
@@ -880,7 +880,7 @@ var treeView = {
if (!this.data[row].filter)
return "";
- return this.data[row].filter.subscriptions.filter(function(s) !s.disabled).map(function(s) s.title).join(", ");
+ return this.data[row].filter.subscriptions.filter(s => !s.disabled).map(s => s.title).join(", ");
}
else
return this.data[row].location;
diff --git a/chrome/content/ui/subscriptionSelection.js b/chrome/content/ui/subscriptionSelection.js
index b9129ea..eebda4c 100644
--- a/chrome/content/ui/subscriptionSelection.js
+++ b/chrome/content/ui/subscriptionSelection.js
@@ -217,7 +217,7 @@ function setCustomSubscription(title, url, mainSubscriptionTitle, mainSubscripti
let link = document.createElement("label");
link.className = "text-link";
link.setAttribute("tooltiptext", mainSubscriptionURL);
- link.addEventListener("click", function() UI.loadInBrowser(mainSubscriptionURL), false);
+ link.addEventListener("click", () => UI.loadInBrowser(mainSubscriptionURL), false);
link.textContent = mainSubscriptionTitle;
messageElement.appendChild(link);
messageElement.appendChild(document.createTextNode(afterLink));
@@ -304,5 +304,5 @@ function doAddSubscription(/**String*/ url, /**String*/ title)
function hasSubscription(url)
{
- return FilterStorage.subscriptions.some(function(subscription) subscription instanceof DownloadableSubscription && subscription.url == url);
+ return FilterStorage.subscriptions.some(subscription => subscription instanceof DownloadableSubscription && subscription.url == url);
}
--
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