Issue 427 - Remove non-standard function and getter syntax

lib/ui.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 108 matching lines @@
         return;
       }
 
       setChecked("adblockplus-savestats", Prefs.savestats);
       addCommandHandler("adblockplus-savestats", function()
       {
         UI.toggleSaveStats(doc.defaultView);
         this.value = Prefs.savestats;
       });
 
-      let hasAcceptableAds = FilterStorage.subscriptions.some(function(subscription) {
-        return (subscription instanceof DownloadableSubscription &&
-                subscription.url == Prefs.subscriptions_exceptionsurl);
-      });
+      let hasAcceptableAds = FilterStorage.subscriptions.some((subscription) => subscription instanceof DownloadableSubscription &&
+        subscription.url == Prefs.subscriptions_exceptionsurl);
       setChecked("adblockplus-acceptableAds", hasAcceptableAds);
       addCommandHandler("adblockplus-acceptableAds", function()
       {
         this.value = UI.toggleAcceptableAds();
       });
 
       setChecked("adblockplus-sync", syncEngine && syncEngine.enabled);
       addCommandHandler("adblockplus-sync", function()
       {
         this.value = UI.toggleSync();
@@ skipping 11 matching lines @@
       {
         // Load subscriptions data
         let request = new XMLHttpRequest();
         request.mozBackgroundRequest = true;
         request.open("GET", "chrome://adblockplus/content/ui/subscriptions.xml");
         request.addEventListener("load", function()
         {
           if (onShutdown.done)
             return;
 
-          let currentSubscription = FilterStorage.subscriptions.filter(function(subscription) {
-            return (subscription instanceof DownloadableSubscription &&
-                    subscription.url != Prefs.subscriptions_exceptionsurl);
-          });
+          let currentSubscription = FilterStorage.subscriptions.filter((subscription) => subscription instanceof DownloadableSubscription &&
+            subscription.url != Prefs.subscriptions_exceptionsurl);
           currentSubscription = (currentSubscription.length ? currentSubscription[0] : null);
 
           let subscriptions =request.responseXML.getElementsByTagName("subscription");
           for (let i = 0; i < subscriptions.length; i++)
           {
             let item = subscriptions[i];
             let url = item.getAttribute("url");
             if (!url)
               continue;
 
@@ skipping 158 matching lines @@
   {
     Utils.splitAllLabels(root);
 
     let specialElements = {"abp-status-popup": true, "abp-status": true, "abp-toolbarbutton": true, "abp-menuitem": true, "abp-bottombar-container": true};
 
     this.overlay = {all: []};
 
     // Remove whitespace text nodes
     let walker = root.ownerDocument.createTreeWalker(
       root, Ci.nsIDOMNodeFilter.SHOW_TEXT,
-      function(node) { return !/\S/.test(node.nodeValue) }, false
+      (node) => !/\S/.test(node.nodeValue), false
     );
     let whitespaceNodes = [];
     while (walker.nextNode())
       whitespaceNodes.push(walker.currentNode);
 
     for (let i = 0; i < whitespaceNodes.length; i++)
       whitespaceNodes[i].parentNode.removeChild(whitespaceNodes[i]);
 
     // Put overlay elements into appropriate fields
     while (root.firstElementChild)
@@ skipping 99 matching lines @@
     }.bind(this));
     FilterNotifier.addListener(function(action)
     {
       if (/^(filter|subscription)\.(added|removed|disabled|updated)$/.test(action) || action == "load")
         this.updateState();
     }.bind(this));
 
     notificationTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
     notificationTimer.initWithCallback(this.showNextNotification.bind(this),
                                        3 * 60 * 1000, Ci.nsITimer.TYPE_ONE_SHOT);
-    onShutdown.add(function() { notificationTimer.cancel(); });
+    onShutdown.add(() => notificationTimer.cancel());
 
     // Add "anti-adblock messages" notification
     initAntiAdblockNotification();
 
     let documentCreationObserver = {
       observe: function(subject, topic, data)
       {
         if (!(subject instanceof Ci.nsIDOMWindow))
           return;
 
@@ skipping 285 matching lines @@
     let addAcceptable = (Services.vc.compare(prevVersion, "2.0") < 0);
     let privacySubscriptions = {
       "https://easylist-downloads.adblockplus.org/easyprivacy+easylist.txt": true,
       "https://easylist-downloads.adblockplus.org/easyprivacy.txt": true,
       "https://secure.fanboy.co.nz/fanboy-tracking.txt": true,
       "https://fanboy-adblock-list.googlecode.com/hg/fanboy-adblocklist-stats.txt": true,
       "https://bitbucket.org/fanboy/fanboyadblock/raw/tip/fanboy-adblocklist-stats.txt": true,
       "https://hg01.codeplex.com/fanboyadblock/raw-file/tip/fanboy-adblocklist-stats.txt": true,
       "https://adversity.googlecode.com/hg/Adversity-Tracking.txt": true
     };
-    if (FilterStorage.subscriptions.some(function(subscription) {
-          return (subscription.url == Prefs.subscriptions_exceptionsurl ||
-                  subscription.url in privacySubscriptions);
-        }))
+    if (FilterStorage.subscriptions.some((subscription) => subscription.url == Prefs.subscriptions_exceptionsurl || subscription.url in privacySubscriptions))
       addAcceptable = false;
 
     // Don't add subscription if the user has a subscription already
     let addSubscription = true;
-    if (FilterStorage.subscriptions.some(function(subscription) {
-          return (subscription instanceof DownloadableSubscription &&
-                  subscription.url != Prefs.subscriptions_exceptionsurl);
-        }))
+    if (FilterStorage.subscriptions.some((subscription) => subscription instanceof DownloadableSubscription && subscription.url != Prefs.subscriptions_exceptionsurl))
       addSubscription = false;
 
     // If this isn't the first run, only add subscription if the user has no custom filters
     if (addSubscription && Services.vc.compare(prevVersion, "0.0") > 0)
     {
-      if (FilterStorage.subscriptions.some(function(subscription) {
-          return (subscription.url != Prefs.subscriptions_exceptionsurl &&
-                  subscription.filters.length);
-          }))
+      if (FilterStorage.subscriptions.some((subscription) => subscription.url != Prefs.subscriptions_exceptionsurl && subscription.filters.length))
         addSubscription = false;
     }
 
     // Add "acceptable ads" subscription
     if (addAcceptable)
     {
       let subscription = Subscription.fromURL(Prefs.subscriptions_exceptionsurl);
       if (subscription)
       {
         subscription.title = "Allow non-intrusive advertising";
         FilterStorage.addSubscription(subscription);
         if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
           Synchronizer.execute(subscription);
       }
       else
         addAcceptable = false;
     }
 
-    // Add "anti-adblock messages" subscription
-    let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
-    if (subscription)
-    {
-      subscription.disabled = true;
-      FilterStorage.addSubscription(subscription);
-      if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
-        Synchronizer.execute(subscription);
+    // Add "anti-adblock messages" subscription for new users and users updating from old ABP versions
+    if (Services.vc.compare(prevVersion, "2.5") < 0)
+    {
+      let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
+      if (subscription && !(subscription.url in FilterStorage.knownSubscriptions))
+      {
+        subscription.disabled = true;
+        FilterStorage.addSubscription(subscription);
+        if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
+          Synchronizer.execute(subscription);
+      }
     }
 
     if (!addSubscription && !addAcceptable)
       return;
 
     function notifyUser()
     {
       let {addTab} = require("appSupport");
       if (addTab)
       {
@@ skipping 250 matching lines @@
     if (!icon)
       return;
 
     let state = (Prefs.enabled ? "active" : "disabled");
     if (state == "active")
     {
       let location = this.getCurrentLocation(window);
       if (location && Policy.isWhitelisted(location.spec))
         state = "whitelisted";
     }
-
+    
+    let popupId = "abp-status-popup";
     if (icon.localName == "statusbarpanel")
     {
       if (Prefs.defaultstatusbaraction == 0)
-        icon.setAttribute("popup", icon.getAttribute("context"));
+      {
+        icon.setAttribute("popup", popupId);
+        icon.removeAttribute("context");
+      }
       else
+      {
         icon.removeAttribute("popup");
+        icon.setAttribute("context", popupId);
+      }
     }
     else
     {
       if (Prefs.defaulttoolbaraction == 0)
+      {
         icon.setAttribute("type", "menu");
+        icon.removeAttribute("context");
+      }
       else
+      {
         icon.setAttribute("type", "menu-button");
+        icon.setAttribute("context", popupId);
+      }
     }
 
     icon.setAttribute("abpstate", state);
   },
 
   /**
    * Shows or hides status bar icons in all windows, according to pref.
    */
   updateStatusbarIcon: function(/**Window*/ window)
   {
@@ skipping 29 matching lines @@
     Prefs[pref] = !Prefs[pref];
   },
 
   /**
    * If the given filter is already in user's list, removes it from the list. Otherwise adds it.
    */
   toggleFilter: function(/**Filter*/ filter)
   {
     if (filter.subscriptions.length)
     {
-      if (filter.disabled || filter.subscriptions.some(function(subscription) {
-            return !(subscription instanceof SpecialSubscription);
-          }))
+      if (filter.disabled || filter.subscriptions.some((subscription) => !(subscription instanceof SpecialSubscription)))
         filter.disabled = !filter.disabled;
       else
         FilterStorage.removeFilter(filter);
     }
     else
       FilterStorage.addFilter(filter);
   },
 
 
   /**
@@ skipping 14 matching lines @@
       Prefs.savestats = true;
   },
 
   /**
    * Sets the current filter subscription in a single-subscription scenario,
    * all other subscriptions will be removed.
    */
   setSubscription: function(url, title)
   {
     let subscription = Subscription.fromURL(url);
-    let currentSubscriptions = FilterStorage.subscriptions.filter(function(subscription) {
-      return (subscription instanceof DownloadableSubscription &&
-              subscription.url != Prefs.subscriptions_exceptionsurl);
-    });
+    let currentSubscriptions = FilterStorage.subscriptions.filter(
+      ((subscription) => subscription instanceof DownloadableSubscription && subscription.url != Prefs.subscriptions_exceptionsurl
+    );
     if (!subscription || currentSubscriptions.indexOf(subscription) >= 0)
       return;
 
     for (let i = 0; i < currentSubscriptions.length; i++)
       FilterStorage.removeSubscription(currentSubscriptions[i]);
 
     subscription.title = title;
     FilterStorage.addSubscription(subscription);
     if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
       Synchronizer.execute(subscription);
@@ skipping 122 matching lines @@
       return true;
     }
     return false;
   },
 
   /**
    * Updates state of the icon tooltip.
    */
   fillIconTooltip: function(/**Event*/ event, /**Window*/ window)
   {
-    function E(id) {
-      return window.document.getElementById(id);
-    }
+    let E = (id) => window.document.getElementById(id);
 
     let node = window.document.tooltipNode;
     if (!node || !node.hasAttribute("tooltip"))
     {
       event.preventDefault();
       return;
     }
 
     // Prevent tooltip from overlapping menu
     for (let id of ["abp-toolbar-popup", "abp-status-popup"])
@@ skipping 17 matching lines @@
       actionDescr.setAttribute("value", Utils.getString("action" + action + "_tooltip"));
 
     let statusDescr = E("abp-tooltip-status");
     let state = node.getAttribute("abpstate");
     let statusStr = Utils.getString(state + "_tooltip");
     if (state == "active")
     {
       let [activeSubscriptions, activeFilters] = FilterStorage.subscriptions.reduce(function([subscriptions, filters], current)
       {
         if (current instanceof SpecialSubscription)
-          return [subscriptions, filters + current.filters.filter(function(filter) { return !filter.disabled; }).length];
+          return [subscriptions, filters + current.filters.filter((filter) => !filter.disabled).length];
         else if (!current.disabled && !(Prefs.subscriptions_exceptionscheckbox && current.url == Prefs.subscriptions_exceptionsurl))
           return [subscriptions + 1, filters];
         else
           return [subscriptions, filters]
       }, [0, 0]);
 
       statusStr = statusStr.replace(/\?1\?/, activeSubscriptions).replace(/\?2\?/, activeFilters);
     }
     statusDescr.setAttribute("value", statusStr);
 
@@ skipping 549 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });