Issue 427 - Remove non-standard function and getter syntax

lib/appSupport.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 10 matching lines @@
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/AddonManager.jsm");
 
 /**
  * Checks whether an application window is known and should get Adblock Plus
  * user interface elements.
  * @result Boolean
  */
-exports.isKnownWindow = function isKnownWindow(/**Window*/ window) {

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

(/**Window*/ window) => false?

-  return false;
-}
+exports.isKnownWindow = (/**Window*/ window) => false;
 
 /**
  * HACK: In some applications the window finishes initialization during load
  * event processing which makes an additional delay necessary. This flag
  * indicates that.
  * @type Boolean
  */
 exports.delayInitialization = false;
 
 /**
@@ skipping 215 matching lines @@
 let {application} = require("info");
 switch (application)
 {
   case "firefox":
   {
     exports.isKnownWindow = function ff_isKnownWindow(window)
     {
       return (window.document.documentElement.getAttribute("windowtype") == "navigator:browser");
     };
 
-    exports.getBrowser = function ff_getBrowser(window) {
-      return window.gBrowser
-    };

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

(window) => window.gBrowser?

+    exports.getBrowser = (window) => window.gBrowser;
 
     exports.addTab = function ff_addTab(window, url, event)
     {
       if (event)
         window.openNewTabWith(url, exports.getBrowser(window).contentDocument, null, event, false);
       else
         window.gBrowser.loadOneTab(url, {inBackground: false});
     };
 
     exports.contentContextMenu = "contentAreaContextMenu";
@@ skipping 111 matching lines @@
   case "thunderbird":
   {
     exports.isKnownWindow = function tb_isKnownWindow(window)
     {
       let type = window.document.documentElement.getAttribute("windowtype");
       return (type == "mail:3pane" || type == "mail:messageWindow");
     };
 
     exports.delayInitialization = true;
 
-    exports.getBrowser = function tb_getBrowser(window) {
-      return window.getBrowser();
-    }

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

(window) => window.getBrowser()?

+    exports.getBrowser = (window) => window.getBrowser();
 
     exports.addTab = function tb_addTab(window, url, event)
     {
       let tabmail = window.document.getElementById("tabmail");
       if (!tabmail)
       {
         let wnd = Services.wm.getMostRecentWindow("mail:3pane");
         if (window)
           tabmail = wnd.document.getElementById("tabmail");
       }
@@ skipping 266 matching lines @@
         listener.detach();
         this.listeners.delete(window);
       }
     });
 
     break;
   }
 
   case "fennec2":
   {
-    exports.isKnownWindow = function fmn_isKnownWindow(/**Window*/ window) {
-      return window.document.documentElement.id == "main-window";
-    };
-
-    exports.getBrowser = function fmn_getBrowser(window) {
-      return window.BrowserApp.selectedBrowser;
-    };
-
-    exports.addTab = function fmn_addTab(window, url, event) {
-      return window.BrowserApp.addTab(url, {selected: true});
-    };

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

Use fat arrow expressions here?

+    exports.isKnownWindow = (window) => window.document.documentElement.id == "main-window";
+
+    exports.getBrowser = (window) => window.BrowserApp.selectedBrowser;
+
+    exports.addTab = (window, url, event) => window.BrowserApp.addTab(url, {selected: true});
 
     let BrowserChangeListener = function(window, callback)
     {
       this.window = window;
       this.callback = callback;
       this.onSelect = this.onSelect.bind(this);
       this.attach();
     };
     BrowserChangeListener.prototype = {
       window: null,
@@ skipping 238 matching lines @@
             event.state = {id: require("info").addonID};
             browser._contentWindow.dispatchEvent(event);
           });
         });
       }, true);
     };
 
     break;
   }
 }