Bug 825592 - Followup 814460 - Add icon from Everything.me on Homescreen

dscravag · Dec 31, 2012 · 1901b71 · 1901b71
1 parent 7fae199
commit 1901b71
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/apps/homescreen/everything.me/js/etmmanager.js b/apps/homescreen/everything.me/js/etmmanager.js
@@ -20,7 +20,8 @@ var EvmeManager = (function EvmeManager() {
         GridManager.install(new Bookmark({
           bookmarkURL: params.originUrl,
           name: params.title,
-          icon: params.icon
+          icon: params.icon,
+          iconable: false
         }));
     }
 

diff --git a/apps/homescreen/js/bookmark.js b/apps/homescreen/js/bookmark.js
@@ -3,6 +3,12 @@
 var Bookmark = function Bookmark(params) {
   this.removable = true;
 
+  if ('iconable' in params) {
+    this.iconable = params.iconable;
+  } else {
+    this.iconable = true;
+  }
+
   this.isBookmark = true;
   this.url = this.bookmarkURL = this.origin = params.bookmarkURL;
 

diff --git a/apps/homescreen/js/page.js b/apps/homescreen/js/page.js
@@ -226,7 +226,7 @@ Icon.prototype = {
   },
 
   renderImage: function icon_renderImage(img) {
-    if( this.app && this.app.isBookmark ) {
+    if( this.app && this.app.iconable ) {
       this.renderImageForBookMark(img);
       return;
     }
@@ -730,7 +730,7 @@ Page.prototype = {
 };
 
 function getDefaultIcon(app){
-  if (app && app.isBookmark) {
+  if (app && app.iconable) {
     return Icon.prototype.DEFAULT_BOOKMARK_ICON_URL;
   } else {
     return Icon.prototype.DEFAULT_ICON_URL;