Merge pull request #16341 from KevinGrandon/bug_971268_search_browser…

…_bookmarking Bug 971268 - Enable bookmark icon for results launched from search app r=ran, amirn
mozilla-b2g · Feb 18, 2014 · ac06cfb · ac06cfb
2 parents a419c6c + 0614962
commit ac06cfb
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 6 deletions.
diff --git a/apps/search/js/providers/webresults.js b/apps/search/js/providers/webresults.js
@@ -20,7 +20,11 @@
     click: function(e) {
       var url = e.target && e.target.dataset.url;
       if (url) {
-        Search.navigate(url);
+        Search.navigate(url, {
+          icon: e.target.dataset.icon,
+          originUrl: url,
+          originName: e.target.dataset.title
+        });
       }
     },
 
@@ -42,7 +46,9 @@
               title: app.name,
               icon: app.icon,
               dataset: {
-                url: app.appUrl
+                title: app.name,
+                url: app.appUrl,
+                icon: app.icon
               }
             };
           });

diff --git a/apps/search/js/search.js b/apps/search/js/search.js
@@ -146,9 +146,26 @@
 
     /**
      * Opens a browser to a URL
+     * @param {String} url The url to navigate to
+     * @param {Object} config Optional configuration.
      */
-    navigate: function(url) {
-      window.open(url, '_blank', 'remote=true,useAsyncPanZoom=true');
+    navigate: function(url, config) {
+      var features = {
+        remote: true,
+        useAsyncPanZoom: true
+      };
+
+      config = config || {};
+      for (var i in config) {
+        features[i] = config[i];
+      }
+
+      var featureStr = Object.keys(features)
+        .map(function(key) {
+          return encodeURIComponent(key) + '=' +
+            encodeURIComponent(features[key]);
+        }).join(',');
+      window.open(url, '_blank', featureStr);
     },
 
     /**

diff --git a/apps/search/test/unit/providers/webresults_test.js b/apps/search/test/unit/providers/webresults_test.js
@@ -40,11 +40,16 @@ suite('search/providers/webresults', function() {
       subject.click({
         target: {
           dataset: {
-            url: 'http://mozilla.org'
+            url: 'http://mozilla.org',
+            icon: 'http://mozilla.org/img'
           }
         }
       });
-      assert.ok(stub.calledWith('http://mozilla.org'));
+      assert.ok(stub.calledWith('http://mozilla.org', {
+        icon: 'http://mozilla.org/img',
+        originName: undefined,
+        originUrl: 'http://mozilla.org'
+      }));
     });
   });
 

diff --git a/apps/search/test/unit/search_test.js b/apps/search/test/unit/search_test.js
@@ -199,6 +199,17 @@ suite('search/search', function() {
       Search.navigate(url);
       assert.ok(stub.calledWith(url));
     });
+
+    test('parses features', function() {
+      var url = 'http://mozilla.org';
+      var stub = this.sinon.stub(window, 'open');
+      Search.navigate(url, {
+        a: 1,
+        b: 2
+      });
+      assert.ok(stub.calledWith(url, '_blank',
+        'remote=true,useAsyncPanZoom=true,a=1,b=2'));
+    });
   });
 
   suite('expandSearch', function() {