Issue 2257 - Replaced non-standard function expressions with ES6 arrow functions

chrome/content/ui/sidebar.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 377 matching lines @@
   E("contextDisableFilter").hidden = true;
   E("contextEnableFilter").hidden = true;
   E("contextDisableOnSite").hidden = true;
   if ("filter" in item && item.filter)
   {
     let filter = item.filter;
     let menuItem = E(filter.disabled ? "contextEnableFilter" : "contextDisableFilter");
     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 {
         domain = Utils.effectiveTLD.getBaseDomainFromHost(item.docDomain);
       } catch (e) {}
 
       if (domain && !filter.isActiveOnlyOnDomain(domain))
       {
         menuItem = E("contextDisableOnSite");
         menuItem.setAttribute("label", menuItem.getAttribute("labeltempl").replace(/\?1\?/, domain));
@@ skipping 110 matching lines @@
   treeView.boxObject.invalidate();
 }
 
 /**
  * Edits the filter to disable it on a particular domain.
  */
 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;
   try {
     domain = Utils.effectiveTLD.getBaseDomainFromHost(item.docDomain).toUpperCase();
   }
   catch (e)
   {
     return;
   }
 
   // Generate text for new filter that excludes current domain
   let text = filter.text;
   if (filter instanceof RegExpFilter)
   {
     let match = Filter.optionsRegExp.exec(text);
     if (match)
     {
       let found = false;
       let options = match[1].toUpperCase().split(",");
       for (let i = 0; i < options.length; i++)
       {
         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));

[tschuster, 2015/04/13 10:13:14]

And wow that thing! :)

           domains.push("~" + domain);
           options[i] = "DOMAIN=" + domains.join("|");
           found = true;
           break;
         }
       }
       if (!found)
         options.push("DOMAIN=~" + domain);
 
       text = text.replace(Filter.optionsRegExp, "$" + options.join(",").toLowerCase());
     }
     else
       text += "$domain=~" + domain.toLowerCase();
   }
   else if (filter instanceof ElemHideBase)
   {
     let match = /^([^#]+)(#.*)/.exec(text);
     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;
     }
     else
       text = "~" + domain.toLowerCase() + text;
   }
 
   if (text == filter.text)
     return;   // Just in case, shouldn't happen
 
   // Insert new filter before the old one and remove the old one then
   let newFilter = Filter.fromText(text);
   if (newFilter.disabled && newFilter.subscriptions.length)
     newFilter.disabled = false;
   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));
   }
   FilterStorage.removeFilter(filter);
 
   // Update display
   for (let i = 0; i < treeView.allData.length; i++)
     if (treeView.allData[i].filter == filter)
       treeView.allData[i].filter = null;
   treeView.boxObject.invalidate();
@@ skipping 137 matching lines @@
   else if (item1.thirdParty && !item2.thirdParty)
     return -1;
   else if (!item1.thirdParty && item2.thirdParty)
     return 1;
   else
     return 0;
 }
 
 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)
     return 1;
   else
     return 0;
 }
 
 function createSortWithFallback(cmpFunc, fallbackFunc, desc) {
   var factor = (desc ? -1 : 1);
@@ skipping 109 matching lines @@
         let size = getItemSize(this.data[row]);
         return (size ? size.join(" x ") : "");
       }
       else if (col == "docDomain")
         return this.data[row].docDomain + " " + (this.data[row].thirdParty ? docDomainThirdParty : docDomainFirstParty);
       else if (col == "filterSource")
       {
         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;
     }
     else {
       // Empty list, show dummy
       if (row > 0 || (col != "address" && col != "filter"))
         return "";
       if (col == "filter") {
         var filter = Policy.isWindowWhitelisted(window.content);
@@ skipping 368 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }