Merge pull request #32411 from gmarty/Bug-1196809-Pick-best-available…

…-icon-for-pinned-sites-on-homescreen-hotfix Bug 1196809 - Fix bad reference to id property. r=cwiis
mozilla-b2g · Oct 13, 2015 · fde07d1 · fde07d1
2 parents a9ee136 + cf5ee8f
commit fde07d1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/apps/homescreen/js/app.js b/apps/homescreen/js/app.js
@@ -935,7 +935,7 @@ const BLACKLIST = [];
             id = this.getIconId(icon.app ? icon.app : icon.bookmark,
                                 icon.entryPoint);
             if (id === this.iconsToRetry[i]) {
-              if (icon.id) {
+              if (icon.bookmark) {
                 this.setBookmarkIcon(icon);
               } else {
                 icon.refresh();

diff --git a/apps/verticalhome/test/marionette/app_hosted_use_cached_icon_test.js b/apps/verticalhome/test/marionette/app_hosted_use_cached_icon_test.js
@@ -71,8 +71,7 @@ marionette('Vertical Home - Hosted app cached icon fetch', function() {
 
     // check for the cached icon...
     client.waitFor(function() {
-      return iconSrc(icon) ===
-        '/shared/elements/gaia_grid/images/default_icon.png';
+      return iconSrc(icon) === 'blobcache';
     });
 
     // allow the request to succeed

diff --git a/shared/elements/gaia-site-icon/.bower.json b/shared/elements/gaia-site-icon/.bower.json
@@ -21,11 +21,11 @@
     "tests"
   ],
   "homepage": "https://github.com/gaia-components/gaia-site-icon",
-  "_release": "2c5b344e05",
+  "_release": "a77175df04",
   "_resolution": {
     "type": "branch",
     "branch": "master",
-    "commit": "2c5b344e05f3431fe723c33644439b740810269b"
+    "commit": "a77175df04655c5c5a730d0655bc7bf7c4ccfd55"
   },
   "_source": "git://github.com/gaia-components/gaia-site-icon.git",
   "_target": "*",

diff --git a/shared/elements/gaia-site-icon/script.js b/shared/elements/gaia-site-icon/script.js
@@ -291,16 +291,16 @@ window.GaiaAppIcon = (function(exports) {
         this._image = null;
         this._hasIcon = true;
 
-        if (!this._hasPredefinedIcon) {
-          this.dispatchEvent(new CustomEvent('icon-loaded'));
-        }
-
         // Set icon URL on dataset, for testing.
         if (this._pendingIconUrl) {
           this._iconUrl = this.dataset.testIconUrl = this._pendingIconUrl;
           this._pendingIconUrl = null;
         }
 
+        if (!this._hasPredefinedIcon) {
+          this.dispatchEvent(new CustomEvent('icon-loaded'));
+        }
+
         if (this._pendingIconRefresh) {
           this._image = null;
           this._pendingIconRefresh = false;