Merge pull request #16557 from crdlc/bug-975834

Bug 975834 - homescreen bookmarks do not work for URLs ending in a file
mozilla-b2g · Feb 27, 2014 · d7ceb7d · d7ceb7d
2 parents 07883f3 + f4c1a2d
commit d7ceb7d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 23 deletions.
diff --git a/apps/homescreen/everything.me/js/etmmanager.js b/apps/homescreen/everything.me/js/etmmanager.js
@@ -323,9 +323,8 @@ var EvmeManager = (function EvmeManager() {
     removeGridItem: removeGridItem,
 
     isBookmarked: function isBookmarked(url) {
-      // Bookmarks have a trailing '/' in order to distinguish from apps
-      // internally in the Homescreen
-      return GridManager.getApp(url.endsWith('/') ? url : url + '/');
+      return GridManager.getIconForBookmark(
+              Bookmark.prototype.generateIndex(url));
     },
 
     getIconByDescriptor: getIconByDescriptor,

diff --git a/apps/homescreen/js/bookmark.js b/apps/homescreen/js/bookmark.js
@@ -3,15 +3,20 @@
 var Bookmark = function Bookmark(params) {
   GridItem.call(this, params);
 
-  var url = params.bookmarkURL.trim();
-  this.url = this.origin = this.bookmarkURL = url.endsWith('/') ? url :
-                                                                  url + '/';
+  this.url = this.origin = params.bookmarkURL.trim();
+  // The bookmarkURL is used for indexing bookmarks in the homescreen. "It's not
+  // a real URL", just used for indexing in homescreen (bug #976955)
+  this.bookmarkURL = this.generateIndex(this.url);
   this.type = GridItemsFactory.TYPE.BOOKMARK;
 };
 
 Bookmark.prototype = {
   __proto__: GridItem.prototype,
 
+  generateIndex: function bookmark_generateIndex(url) {
+    return 'bookmark:' + url;
+  },
+
   launch: function bookmark_launch() {
     var features = this.getFeatures();
 

diff --git a/apps/homescreen/test/unit/bookmark_editor_test.js b/apps/homescreen/test/unit/bookmark_editor_test.js
@@ -87,7 +87,7 @@ suite('bookmark.js >', function() {
     test('This bookmark defines the url correctly >', function() {
       assert.equal(bookmark.origin, URL);
       assert.equal(bookmark.url, URL);
-      assert.equal(bookmark.bookmarkURL, URL);
+      assert.equal(bookmark.bookmarkURL, bookmark.generateIndex(URL));
     });
 
     test('This bookmark defines the icon correctly >', function() {

diff --git a/apps/homescreen/test/unit/bookmark_test.js b/apps/homescreen/test/unit/bookmark_test.js
@@ -40,22 +40,9 @@ suite('bookmark.js >', function() {
   });
 
   test('This bookmark defines the url correctly >', function() {
-    var expectedURL = URL + '/';
-    assert.equal(bookmark.origin, expectedURL);
-    assert.equal(bookmark.url, expectedURL);
-    assert.equal(bookmark.bookmarkURL, expectedURL);
-
-    bookmark = new Bookmark({
-      bookmarkURL: URL + '/',
-      name: name,
-      icon: icon,
-      iconable: false,
-      useAsyncPanZoom: true
-    });
-
-    assert.equal(bookmark.origin, expectedURL);
-    assert.equal(bookmark.url, expectedURL);
-    assert.equal(bookmark.bookmarkURL, expectedURL);
+    assert.equal(bookmark.origin, URL);
+    assert.equal(bookmark.url, URL);
+    assert.equal(bookmark.bookmarkURL, bookmark.generateIndex(URL));
   });
 
   test('This bookmark defines the icon correctly >', function() {