Noissue - Merge current tip to Edge bookmark

lib/icon.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module icon */
 
 "use strict";
 
 const {FilterNotifier} = require("filterNotifier");
 
-const frameOpacities =  [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9,
-                         1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
-                         0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1, 0.0];
+const frameOpacities = [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9,
+                        1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
+                        0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2, 0.1, 0.0];
 const numberOfFrames = frameOpacities.length;
 
 let stopRequested = false;
 let canUpdateIcon = true;
 let notRunning = Promise.resolve();
 let whitelistedState = new ext.PageMap();
 
 function loadImage(url)
 {
   return new Promise((resolve, reject) =>
   {
     let image = new Image();
     image.src = url;
     image.addEventListener("load", () =>
     {
       resolve(image);
     });
     image.addEventListener("error", () =>
     {
       reject("Failed to load image " + url);
     });
   });
-};
+}
 
 function setIcon(page, notificationType, opacity, frames)
 {
   opacity = opacity || 0;
   let whitelisted = !!whitelistedState.get(page);
 
   if (!notificationType || !frames)
   {
     if (opacity > 0.5)
-      page.browserAction.setIcon("icons/abp-$size-notification-"
-                                 + notificationType + ".png");
+    {
+      page.browserAction.setIcon("/icons/abp-$size-notification-" +
+                                 notificationType + ".png");
+    }
     else
-      page.browserAction.setIcon("icons/abp-$size" +
+    {
+      page.browserAction.setIcon("/icons/abp-$size" +
                                  (whitelisted ? "-whitelisted" : "") + ".png");
+    }
   }
   else
   {
     chrome.browserAction.setIcon({
       tabId: page.id,
       imageData: frames["" + opacity + whitelisted]
     });
   }
 }
 
@@ skipping 21 matching lines @@
     loadImage("icons/abp-32-notification-" + notificationType + ".png"),
     loadImage("icons/abp-38.png"),
     loadImage("icons/abp-38-whitelisted.png"),
     loadImage("icons/abp-38-notification-" + notificationType + ".png"),
     loadImage("icons/abp-40.png"),
     loadImage("icons/abp-40-whitelisted.png"),
     loadImage("icons/abp-40-notification-" + notificationType + ".png")
   ]).then(images =>
   {
     let imageMap = {
-      16: { base: [images[0], images[1]], overlay: images[2] },
-      19: { base: [images[3], images[4]], overlay: images[5] },
-      20: { base: [images[6], images[7]], overlay: images[8] },
-      32: { base: [images[9], images[10]], overlay: images[11] },
-      38: { base: [images[12], images[13]], overlay: images[14] },
-      40: { base: [images[15], images[16]], overlay: images[17] }
+      16: {base: [images[0], images[1]], overlay: images[2]},
+      19: {base: [images[3], images[4]], overlay: images[5]},
+      20: {base: [images[6], images[7]], overlay: images[8]},
+      32: {base: [images[9], images[10]], overlay: images[11]},
+      38: {base: [images[12], images[13]], overlay: images[14]},
+      40: {base: [images[15], images[16]], overlay: images[17]}
     };
 
     let frames = {};
     let canvas = document.createElement("canvas");
     let context = canvas.getContext("2d");
 
     for (let whitelisted of [false, true])
     {
       for (let i = 0, opacity = 0; i <= 10; opacity = ++i / 10)
       {
@@ skipping 71 matching lines @@
   {
     stopRequested = false;
   });
 };
 
 /**
  * Starts to animate the browser action icon to indicate a pending notifcation.
  * If the icon is already animated, it replaces the previous
  * animation as soon as the current interval has been finished.
  *
- * @param {string} type  The notification type (i.e: "information" or "critical")
+ * @param {string} type  The notification type (i.e: "information" or
+ *                       "critical".)
  */
 exports.startIconAnimation = type =>
 {
   notRunning = new Promise(resolve =>
   {
     Promise.all([renderFrames(type), stopIconAnimation()]).then(results =>
     {
       if (stopRequested)
       {
         resolve();
@@ skipping 10 matching lines @@
           clearInterval(interval);
           resolve();
           return;
         }
 
         animateIcon(type, frames);
       }, 10000);
     });
   });
 };