[Pkg-mozext-commits] [adblock-plus] 25/41: Issue 2072 - Don't duplicate 128x128 icon in Chrome builds

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 152cae685fc0747f96372f71bef13f3082ab1e45
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Mon Mar 2 15:07:14 2015 +0100

    Issue 2072 - Don't duplicate 128x128 icon in Chrome builds
---
 firstRun.html                          |   2 +-
 firstRun.js                            |  11 +++++++++++
 skin/{abp-icon-big.png => abp-128.png} | Bin
 skin/firstRun.css                      |   2 --
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/firstRun.html b/firstRun.html
index 116bbea..b3b44fc 100644
--- a/firstRun.html
+++ b/firstRun.html
@@ -30,7 +30,7 @@
 
 
     <header>
-        <div id="logo"></div>
+        <img id="logo">
         <h1 id="title-main" class="i18n_firstRun_title"></h1>
     </header>
 
diff --git a/firstRun.js b/firstRun.js
index fb7f222..3a11a2e 100644
--- a/firstRun.js
+++ b/firstRun.js
@@ -57,6 +57,17 @@
 
   function onDOMLoaded()
   {
+    // Set up logo image
+    var logo = E("logo");
+    logo.src = "skin/abp-128.png";
+    var errorCallback = function()
+    {
+      logo.removeEventListener("error", errorCallback, false);
+      // We are probably in Chrome/Opera/Safari, the image has a different path.
+      logo.src = "icons/detailed/abp-128.png";
+    };
+    logo.addEventListener("error", errorCallback, false);
+
     // Set up URLs
     getDocLink("donate", function(link)
     {
diff --git a/skin/abp-icon-big.png b/skin/abp-128.png
similarity index 100%
rename from skin/abp-icon-big.png
rename to skin/abp-128.png
diff --git a/skin/firstRun.css b/skin/firstRun.css
index 34acf48..5260d4a 100644
--- a/skin/firstRun.css
+++ b/skin/firstRun.css
@@ -155,8 +155,6 @@ section > p
   height: 128px;
   width: 128px;
   display: block;
-  background-image: url(abp-icon-big.png);
-  background-repeat: no-repeat;
 }
 
 #can-do-more

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git