Bug 1131966 - Update suggestions when provider changes. r=kgrandon

apps/search/js/providers/suggestions.js

@@ -9,7 +9,7 @@
   var suggestionsProvider = document.getElementById('suggestions-provider');
   var suggestionsSelect = document.getElementById('suggestions-select');
 
-  SearchProvider.providerUpdated(function() {
+  function providerUpdated() {
 
     navigator.mozL10n.setAttributes(suggestionsProvider, 'search-header', {
       provider: SearchProvider('title').toUpperCase()
@@ -31,9 +31,7 @@
 
     suggestionsSelect.innerHTML = '';
     suggestionsSelect.appendChild(selectFragment);
-  });
-
-  SearchProvider.ready();
+  }
 
   function encodeTerms(str, search) {
     return str.replace('{searchTerms}', encodeURIComponent(search));
@@ -47,11 +45,31 @@
 
     name: 'Suggestions',
 
+    currentSearch: null,
+
     init: function() {
       Provider.prototype.init.apply(this, arguments);
+
       suggestionsSelect.addEventListener('change', function(e) {
         SearchProvider.setProvider(e.target.value);
       });
+
+      SearchProvider.ready().then(() => {
+        providerUpdated();
+        SearchProvider.providerUpdated(() => {
+          providerUpdated();
+          this.redoSearch();
+        });
+      });
+    },
+
+    redoSearch: function() {
+      if (!this.currentSearch) {
+        return;
+      }
+      this.search(this.currentSearch).then(results => {
+        this.render(results);
+      });
     },
 
     click: function(e) {
@@ -61,6 +79,8 @@
     },
 
     search: function(input, preventRemote) {
+
+      this.currentSearch = input;
       this.render([input]);
 
       if (!navigator.onLine || preventRemote) {
@@ -94,11 +114,16 @@
       });
 
       suggestionsWrapper.dataset.loading = false;
-      this.clear();
+      this.container.innerHTML = '';
 
       if (ul.childNodes.length) {
         this.container.appendChild(ul);
       }
+    },
+
+    clear: function() {
+      Provider.prototype.clear.apply(this, arguments);
+      this.currentSearch = null;
     }
 
   };

apps/search/test/marionette/change_providers_test.js

@@ -50,6 +50,8 @@ marionette('Search - Switch Providers Test', function() {
     home.waitForLaunch();
 
     home.focusRocketBar();
+    search.triggerFirstRun(rocketbar);
+
     rocketbar.enterText('sometext');
     search.goToResults();
     client.waitFor(function() {
@@ -60,8 +62,6 @@ marionette('Search - Switch Providers Test', function() {
     client.helper.tapSelectOption(select, 'second');
 
     client.switchToFrame();
-    home.focusRocketBar();
-    rocketbar.enterText('othertext');
     search.goToResults();
     client.waitFor(function() {
       return client.findElements(search.Selectors.suggestions).length === 3;

shared/js/search_provider.js

@@ -32,6 +32,7 @@
 
   // Allow consumers to wait for data to be initialised
   var readyPromise;
+  var resolver;
 
   function extend(dest, source) {
     for (var k in source) {
@@ -97,9 +98,9 @@
         provider = value;
       }
 
-      if (readyPromise && isReady()) {
-        readyPromise();
-        readyPromise = null;
+      if (resolver && isReady()) {
+        resolver();
+        resolver = null;
       }
 
       if (updatedFun) {
@@ -179,8 +180,9 @@
   };
 
   SearchProvider.ready = function() {
-    if (isReady()) {
-      return Promise.resolve();
+
+    if (readyPromise) {
+      return readyPromise;
     }
 
     // Attempt to load cached provider configuration
@@ -200,9 +202,11 @@
       }
     };
 
-    return new Promise(resolve => {
-      readyPromise = resolve;
+    readyPromise = new Promise(resolve => {
+      resolver = resolve;
     });
+
+    return readyPromise;
   };
 
   exports.SearchProvider = SearchProvider;