Relocated icon and redesigned icon popup

safari/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 68 matching lines @@
     sendMessage: sendMessage,
     browserAction: {
       setIcon: function(path)
       {
         safari.extension.toolbarItems[0].image = safari.extension.baseURI + path;
       },
       setTitle: function(title)
       {
         safari.extension.toolbarItems[0].toolTip = title;
       },
-      setBadgeNumber: function(number)
-      {
-        safari.extension.toolbarItems[0].badge = (number === null) ? 0 : number;
+      setBadge: function(badge)
+      {
+        if (!badge)
+          safari.extension.toolbarItems[0].badge = 0;
+        else if ("number" in badge)
+          safari.extension.toolbarItems[0].badge = badge.number;
       },
 
       // The following features aren't supported by Safari
       hide: function() {},
-      show: function() {},
-      setBadgeBackgroundColor: function(color) {}
+      show: function() {}
     }
   };
 
   TabMap = function()
   {
     this._tabs = [];
     this._values = [];
 
     this._onClosed = this._onClosed.bind(this);
   };
@@ skipping 422 matching lines @@
   // clicked. While Chrome loads it everytime you click the icon. So in order to
   // force the same behavior in Safari, we are going to reload the page of the
   // bubble everytime it is shown.
   if (safari.extension.globalPage.contentWindow != window)
     safari.application.addEventListener("popover", function()
     {
       document.documentElement.style.display = "none";
       document.location.reload();
     }, true);
 })();