Fix icon animation

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 85 matching lines @@
 }
 
 // Remove deprecated options before we do anything else.
 removeDeprecatedOptions();
 
 var activeNotification = null;
 
 // Adds or removes browser action icon according to options.
 function refreshIconAndContextMenu(tab)
 {
-  if(!/^https?:/.test(tab.url))
-    return;
+  var excluded = !/^https?:/.test(tab.url) || isWhitelisted(tab.url);
 
   var iconFilename;
   if (require("info").platform == "safari")
     // There is no grayscale version of the icon for whitelisted tabs
     // when using Safari, because icons are grayscale already and icons
     // aren't per tab in Safari.
     iconFilename = "icons/abp-16.png"
   else
-  {
-    var excluded = isWhitelisted(tab.url);
     iconFilename = excluded ? "icons/abp-19-whitelisted.png" : "icons/abp-19.png";
-  }
 
   tab.browserAction.setIcon(iconFilename);
   iconAnimation.registerTab(tab, iconFilename);
 
   // Set context menu status according to whether current tab has whitelisted domain
   if (excluded)
     ext.contextMenus.hideMenuItems();
   else
     ext.contextMenus.showMenuItems();
 }
@@ skipping 293 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);