Issue 427 - Remove non-standard function and getter syntax

lib/filterStorage.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 29 matching lines @@
 /**
  * This class reads user's filters from disk, manages them in memory and writes them back.
  * @class
  */
 let FilterStorage = exports.FilterStorage =
 {
   /**
    * Version number of the patterns.ini format used.
    * @type Integer
    */
-  get formatVersion() { return formatVersion },
+  get formatVersion()
+  {
+    return formatVersion;
+  },
 
   /**
    * File that the filter list has been loaded from and should be saved to
    * @type nsIFile
    */
   get sourceFile()
   {
     let file = null;
     if (Prefs.patternsfile)
     {
@@ skipping 14 matching lines @@
       {
         file = IO.resolveFilePath(Services.prefs.getDefaultBranch("extensions.adblockplus.").getCharPref("data_directory"));
         if (file)
           file.append("patterns.ini");
       } catch(e) {}
     }
 
     if (!file)
       Cu.reportError("Adblock Plus: Failed to resolve filter file location from extensions.adblockplus.patternsfile preference");
 
-    this.__defineGetter__("sourceFile", function() { return file; });
+    this.__defineGetter__("sourceFile", () => file);
     return this.sourceFile;
   },
 
   /**
    * Will be set to true if no patterns.ini file exists.
    * @type Boolean
    */
   firstRun: false,
 
   /**
@@ skipping 122 matching lines @@
    * Adds a user-defined filter to the list
    * @param {Filter} filter
    * @param {SpecialSubscription} [subscription] particular group that the filter should be added to
    * @param {Integer} [position] position within the subscription at which the filter should be added
    * @param {Boolean} silent  if true, no listeners will be triggered (to be used when filter list is reloaded)
    */
   addFilter: function(filter, subscription, position, silent)
   {
     if (!subscription)
     {
-      if (filter.subscriptions.some(function(s) { return (s instanceof SpecialSubscription && !s.disabled); }))
+      if (filter.subscriptions.some(s => s instanceof SpecialSubscription && !s.disabled))
         return;   // No need to add
       subscription = FilterStorage.getGroupForFilter(filter);
     }
     if (!subscription)
     {
       // No group for this filter exists, create one
       subscription = SpecialSubscription.createForFilter(filter);
       this.addSubscription(subscription);
       return;
     }
@@ skipping 382 matching lines @@
           }
         });
       }
     }.bind(this);
 
     let removeLastBackup = function(part1, part2)
     {
       TimeLine.enter("FilterStorage.saveToDisk() -> removeLastBackup()");
       let file = targetFile.clone();
       file.leafName = part1 + "-backup" + Prefs.patternsbackups + part2;
-      IO.removeFile(file, function(e) { renameBackup(part1, part2, Prefs.patternsbackups - 1) });
+      IO.removeFile(file, (e) => renameBackup(part1, part2, Prefs.patternsbackups - 1));
       TimeLine.leave("FilterStorage.saveToDisk() <- removeLastBackup()");
     }.bind(this);
 
     let renameBackup = function(part1, part2, index)
     {
       TimeLine.enter("FilterStorage.saveToDisk() -> renameBackup()");
       if (index > 0)
       {
         let fromFile = targetFile.clone();
         fromFile.leafName = part1 + "-backup" + index + part2;
 
         let toName = part1 + "-backup" + (index + 1) + part2;
 
-        IO.renameFile(fromFile, toName, function(e) { renameBackup(part1, part2, index - 1) });
+        IO.renameFile(fromFile, toName, (e) => renameBackup(part1, part2, index - 1));
       }
       else
       {
         let toFile = targetFile.clone();
         toFile.leafName = part1 + "-backup" + (index + 1) + part2;
 
         IO.copyFile(targetFile, toFile, writeFilters);
       }
       TimeLine.leave("FilterStorage.saveToDisk() <- renameBackup()");
     }.bind(this);
 
     // Do not persist external subscriptions
-    let subscriptions = this.subscriptions.filter(function(s) { return !(s instanceof ExternalSubscription); });
+    let subscriptions = this.subscriptions.filter((s) => !(s instanceof ExternalSubscription));
     if (!explicitFile)
       this._saving = true;
 
     checkBackupRequired(writeFilters, removeLastBackup);
 
     TimeLine.leave("FilterStorage.saveToDisk() done");
   },
 
   /**
    * Returns the list of existing backup files.
@@ skipping 216 matching lines @@
       Subscription.knownSubscriptions = origKnownSubscriptions;
     }
 
     // Allow events to be processed every now and then.
     // Note: IO.readFromFile() will deal with the potential reentrance here.
     this.linesProcessed++;
     if (this.linesProcessed % 1000 == 0)
       Utils.yield();
   }
 };