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

chrome/content/ui/filters-filteractions.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 83 matching lines @@
   {
     E("filters-add-command").setAttribute("disabled", !FilterView.editable);
   },
 
   /**
    * Called whenever filter actions menu is opened, initializes menu items.
    */
   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);
     E("filters-resetHitCounts-command").setAttribute("disabled", !activeItems.length);
     E("filters-moveUp-command").setAttribute("disabled", !editable || FilterView.isSorted() || !items.length || items[0].index == 0);
     E("filters-moveDown-command").setAttribute("disabled", !editable || FilterView.isSorted() || !items.length || items[items.length - 1].index == FilterView.rowCount - 1);
     E("filters-copy-command").setAttribute("disabled", !items.length);
     E("filters-cut-command").setAttribute("disabled", !editable || !items.length);
     E("filters-paste-command").setAttribute("disabled", !editable || !Utils.clipboard.hasDataMatchingFlavors(["text/unicode"], 1, Utils.clipboard.kGlobalClipboard));
   },
@@ skipping 18 matching lines @@
   },
 
   /**
    * Enables or disables all filters in the current selection.
    */
   selectionToggleDisabled: function()
   {
     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();
       let newValue = !items[0].filter.disabled;
       for (let i = 0; i < items.length; i++)
         items[i].filter.disabled = newValue;
       FilterView.boxObject.endUpdateBatch();
     }
   },
 
@@ skipping 42 matching lines @@
     }
     tree.addEventListener("DOMAttrModified", listener, false);
   },
 
   /**
    * Deletes items from the list.
    */
   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);
 
     FilterView.selectRow(oldIndex);
   },
 
   /**
    * Deletes selected filters.
    */
@@ skipping 10 matching lines @@
   },
 
   /**
    * Resets hit counts of the selected filters.
    */
   resetHitCounts: function()
   {
     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));
   },
 
   /**
    * Moves items to a different position in the list.
    * @param {Array} items
    * @param {Integer} offset  negative offsets move the items up, positive down
    */
   _moveItems: function(/**Array*/ items, /**Integer*/ offset)
   {
     if (!items.length)
       return;
 
     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;
 
       for (let i = 0; i < items.length; i++)
         FilterStorage.moveFilter(items[i].filter, FilterView._subscription, items[i].index, position++);
       FilterView.selection.rangedSelect(position - items.length, position - 1, false);
     }
     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;
 
       for (let i = 0; i < items.length; i++)
         FilterStorage.moveFilter(items[i].filter, FilterView._subscription, items[i].index, position--);
       FilterView.selection.rangedSelect(position + 1, position + items.length, false);
     }
   },
 
@@ skipping 123 matching lines @@
   /**
    * Copies selected items to clipboard and optionally removes them from the
    * list after that.
    */
   copySelected: function(/**Boolean*/ keep)
   {
     let items = FilterView.selectedItems;
     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)
       this.deleteItems(items);
   },
 
   /**
    * Pastes text from clipboard as filters at the current position.
    */
   paste: function()
@@ skipping 35 matching lines @@
 
   /**
    * Called whenever the user starts a drag operation.
    */
   startDrag: function(/**Event*/ event)
   {
     let items = FilterView.selectedItems;
     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();
   },
 
   /**
    * Called to check whether moving the items to the given position is possible.
    */
   canDrop: function(/**Integer*/ newPosition, /**nsIDOMDataTransfer*/ dataTransfer)
   {
     if (!FilterView.editable || this.treeElement.editingColumn)
@@ skipping 68 matching lines @@
       return;
 
     this.deleteItems(this.dragItems);
   }
 };
 
 window.addEventListener("load", function()
 {
   FilterActions.init();
 }, false);