Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #7260 from guiora/bug-825592

Bug 825592 - Followup 814460 - Add icon from Everything.me on Homescreen
  • Loading branch information...
commit c33cdcf2ba1122534080dc3b630eb24a8e1cf2de 2 parents 7fae199 + 1901b71
vingtetun authored December 31, 2012
3  apps/homescreen/everything.me/js/etmmanager.js
@@ -20,7 +20,8 @@ var EvmeManager = (function EvmeManager() {
20 20
         GridManager.install(new Bookmark({
21 21
           bookmarkURL: params.originUrl,
22 22
           name: params.title,
23  
-          icon: params.icon
  23
+          icon: params.icon,
  24
+          iconable: false
24 25
         }));
25 26
     }
26 27
 
6  apps/homescreen/js/bookmark.js
@@ -3,6 +3,12 @@
3 3
 var Bookmark = function Bookmark(params) {
4 4
   this.removable = true;
5 5
 
  6
+  if ('iconable' in params) {
  7
+    this.iconable = params.iconable;
  8
+  } else {
  9
+    this.iconable = true;
  10
+  }
  11
+
6 12
   this.isBookmark = true;
7 13
   this.url = this.bookmarkURL = this.origin = params.bookmarkURL;
8 14
 
4  apps/homescreen/js/page.js
@@ -226,7 +226,7 @@ Icon.prototype = {
226 226
   },
227 227
 
228 228
   renderImage: function icon_renderImage(img) {
229  
-    if( this.app && this.app.isBookmark ) {
  229
+    if( this.app && this.app.iconable ) {
230 230
       this.renderImageForBookMark(img);
231 231
       return;
232 232
     }
@@ -730,7 +730,7 @@ Page.prototype = {
730 730
 };
731 731
 
732 732
 function getDefaultIcon(app){
733  
-  if (app && app.isBookmark) {
  733
+  if (app && app.iconable) {
734 734
     return Icon.prototype.DEFAULT_BOOKMARK_ICON_URL;
735 735
   } else {
736 736
     return Icon.prototype.DEFAULT_ICON_URL;

0 notes on commit c33cdcf

Please sign in to comment.
Something went wrong with that request. Please try again.