Issue 427 - Remove non-standard function and getter syntax

lib/filterClasses.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 221 matching lines @@
   __proto__: Filter.prototype,
 
   _disabled: false,
   _hitCount: 0,
   _lastHit: 0,
 
   /**
    * Defines whether the filter is disabled
    * @type Boolean
    */
-  get disabled() this._disabled,
+  get disabled() {

[Wladimir Palant, 2014/05/15 07:12:38]

Nit: Bracket on the next line please, same for the getters below.

+    return this._disabled;
+  },
   set disabled(value)
   {
     if (value != this._disabled)
     {
       let oldValue = this._disabled;
       this._disabled = value;
       FilterNotifier.triggerListeners("filter.disabled", this, value, oldValue);
     }
     return this._disabled;
   },
 
   /**
    * Number of hits on the filter since the last reset
    * @type Number
    */
-  get hitCount() this._hitCount,
+  get hitCount() {
+    return this._hitCount;
+  },
   set hitCount(value)
   {
     if (value != this._hitCount)
     {
       let oldValue = this._hitCount;
       this._hitCount = value;
       FilterNotifier.triggerListeners("filter.hitCount", this, value, oldValue);
     }
     return this._hitCount;
   },
 
   /**
    * Last time the filter had a hit (in milliseconds since the beginning of the epoch)
    * @type Number
    */
-  get lastHit() this._lastHit,
+  get lastHit() {
+    return this._lastHit;
+  },
   set lastHit(value)
   {
     if (value != this._lastHit)
     {
       let oldValue = this._lastHit;
       this._lastHit = value;
       FilterNotifier.triggerListeners("filter.lastHit", this, value, oldValue);
     }
     return this._lastHit;
   },
@@ skipping 172 matching lines @@
     this.contentType = contentType;
   if (matchCase)
     this.matchCase = matchCase;
   if (thirdParty != null)
     this.thirdParty = thirdParty;
 
   if (regexpSource.length >= 2 && regexpSource[0] == "/" && regexpSource[regexpSource.length - 1] == "/")
   {
     // The filter is a regular expression - convert it immediately to catch syntax errors
     let regexp = new RegExp(regexpSource.substr(1, regexpSource.length - 2), this.matchCase ? "" : "i");
-    this.__defineGetter__("regexp", function() regexp);
+    this.__defineGetter__("regexp", () => regexp);
   }
   else
   {
     // No need to convert this filter to regular expression yet, do it on demand
     this.regexpSource = regexpSource;
   }
 }
 exports.RegExpFilter = RegExpFilter;
 
 RegExpFilter.prototype =
@@ skipping 37 matching lines @@
       .replace(/\\\^/g, "(?:[\\x00-\\x24\\x26-\\x2C\\x2F\\x3A-\\x40\\x5B-\\x5E\\x60\\x7B-\\x7F]|$)")
       .replace(/^\\\|\\\|/, "^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?") // process extended anchor at expression start
       .replace(/^\\\|/, "^")       // process anchor at expression start
       .replace(/\\\|$/, "$")       // process anchor at expression end
       .replace(/^(\.\*)/, "")      // remove leading wildcards
       .replace(/(\.\*)$/, "");     // remove trailing wildcards
 
     let regexp = new RegExp(source, this.matchCase ? "" : "i");
 
     delete this.regexpSource;
-    this.__defineGetter__("regexp", function() regexp);
+    this.__defineGetter__("regexp", () => regexp);
     return this.regexp;
   },
   /**
    * Content types the filter applies to, combination of values from RegExpFilter.typeMap
    * @type Number
    */
   contentType: 0x7FFFFFFF,
   /**
    * Defines whether the filter should distinguish between lower and upper case letters
    * @type Boolean
@@ skipping 346 matching lines @@
 function ElemHideException(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
 }
 exports.ElemHideException = ElemHideException;
 
 ElemHideException.prototype =
 {
   __proto__: ElemHideBase.prototype
 };