* Improve handling of switching between searching for offers/wanteds

Freegle · Jun 21, 2018 · 9b735d7 · 9b735d7
1 parent 8ee6613
commit 9b735d7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/http/js/iznik/views/pages/user/find.js b/http/js/iznik/views/pages/user/find.js
@@ -67,22 +67,30 @@ define([
 
         restoreSearchType: function() {
             var self = this;
+            console.log("Restore search type");
             try {
                 var t = Storage.get('searchtype');
+                console.log("Got", t);
                 if (t) {
+                    this.$('.js-searchchoose').show();
                     self.$(".js-searchoffers").boostrapSwitch('state', t == 'Offer' );
                 }
             } catch (e) {}
         },
 
         changeSearchType: function() {
-            // If we change the type of the search when there is something in the search box, do the search again (for
-            // the new type).  This means they don't need to figure out to hit the Search button again, which wouldn't
-            // work anyway because we are already on the correct URL.
-            this.saveSearchType();
-            var term = this.$('.js-search').val();
-            if (term.length > 0) {
-                this.render();
+            var self = this;
+
+            self.saveSearchType();
+
+            if (self.options.search) {
+                // If we change the type of the search when there is something in the search box, do the search again (for
+                // the new type).  This means they don't need to figure out to hit the Search button again, which wouldn't
+                // work anyway because we are already on the correct URL.
+                self.fetchData.messagetype = Storage.get('searchtype');
+                self.collection.reset();
+                self.context = null;
+                self.fetch(self.fetchData);
             }
         },
 
@@ -141,6 +149,7 @@ define([
             });
 
             p.then(function(self) {
+                self.restoreSearchType();
                 self.collection = null;
 
                 if (window.hasOwnProperty('webkitSpeechRecognition')) {
@@ -171,7 +180,6 @@ define([
 
                 if (self.options.search) {
                     // We've searched for something - we're showing the results.
-                    self.restoreSearchType();
                     self.$('h1').hide();
                     self.$('.js-search').val(self.options.search);
 

diff --git a/http/js/iznik/views/user/message.js b/http/js/iznik/views/user/message.js
@@ -1120,7 +1120,7 @@ define([
         render: function() {
             var self = this;
             var p;
-            console.log("Render message", self.model);
+            // console.log("Render message", self.model);
 
             if (self.rendered) {
                 p = Iznik.resolvedPromise(self);