Merge pull request #1659 from OpenBazaar/fixAddressBar

Fix Enter Key In Address Bar

Author: jjeffryes

js/router.js

@@ -199,7 +199,7 @@ module.exports = Backbone.Router.extend({
     };
   },
 
-  newView: function(View, options) {
+  newView: function(View, options, ignoreCache) {
     var now = Date.now(),
         cached = this.viewCache[View.getCacheIndex(Backbone.history.getFragment())],
         requestedRoute = Backbone.history.getFragment(),
@@ -253,7 +253,7 @@ module.exports = Backbone.Router.extend({
       }
     }
 
-    if (cached && (now - cached.cachedAt < cached.view.cacheExpires)) {
+    if (cached && (now - cached.cachedAt < cached.view.cacheExpires && !ignoreCache)) {
       // we have an un-expired cached view, let's reattach it
       this.view = cached.view;
 
@@ -285,10 +285,10 @@ module.exports = Backbone.Router.extend({
 
   launchPageConnectModal: function(config) {
     var defaults = {
-        connectText: 'Connecting...',
-        failedText: 'Unable to Connect.'
-      },
-      deferred = $.Deferred();
+      connectText: 'Connecting...',
+      failedText: 'Unable to Connect.'
+    },
+    deferred = $.Deferred();
 
     if (!(
         config &&
@@ -353,6 +353,8 @@ module.exports = Backbone.Router.extend({
   },
 
   home: function(state, searchText){
+    //if search terms have been given, don't use cached views
+    var ignoreCache = Boolean(searchText);
     this.newView(homeView, {
       viewArgs: {
         userModel: this.userModel,
@@ -361,7 +363,7 @@ module.exports = Backbone.Router.extend({
         state: state,
         searchItemsText: searchText
       }
-    });
+    }, ignoreCache);
 
     // hide the discover onboarding callout
     this.$discoverHolder = this.$discoverHolder || $('.js-OnboardingIntroDiscoverHolder');

js/views/homeVw.js

@@ -196,6 +196,8 @@ module.exports = pageVw.extend({
           backToTopTmpl: backToTopTmpl
         }));
 
+        self.listingToggle = self.$('.js-homeListingToggle');
+
         self.setState(self.state, self.searchItemsText);
         if(self.model.get('page').profile.vendor == true) {
           self.$el.find('.js-homeCreateStore').addClass('hide');
@@ -226,9 +228,9 @@ module.exports = pageVw.extend({
         self.obContainer.on('scroll', self.scrollHandler);
 
         //populate search field
-        if(self.searchItemsText){
+        if (self.searchItemsText){
           self.$el.find('.js-homeSearchItems').val("#" + self.searchItemsText);
-          self.$el.find('.js-homeListingToggle').addClass('hide');
+          self.listingToggle.addClass('hide');
           $('#obContainer').scrollTop(0);
         }
 
@@ -490,12 +492,12 @@ module.exports = pageVw.extend({
   },
 
   searchItemsFocus: function(){
-    this.$('.js-homeListingToggle').addClass('hide');
+    this.listingToggle.addClass('hide');
   },
 
   searchItemsBlur: function(){
     if (!this.searchItemsText){
-      this.$('.js-homeListingToggle').removeClass('hide');
+      this.listingToggle.removeClass('hide');
     }
   },
 
@@ -529,7 +531,7 @@ module.exports = pageVw.extend({
     window.obEventBus.trigger("setAddressBar", {'addressText': ""});
 
     this.$el.find('.js-discoverHeading').html(window.polyglot.t('Discover'));
-    this.$el.find('.js-homeListingToggle').removeClass('hide');
+    this.listingToggle.removeClass('hide');
 
     // change loading text copy
     this.$el.find('.js-loadingText').html(this.$el.find('.js-loadingText').data('defaultText'));

js/views/pageNavVw.js

@@ -666,8 +666,8 @@ module.exports = baseVw.extend({
 
     //detect enter key
     if (e.keyCode == 13){
-      // Stop right here! Route was already changed
       if (this.suggestionsVw.wasSelectedOnEnter()) {
+        //if enter was clicked while a suggestion was highlighted, let the suggestions view handle the routing
         return;
       }
 

js/views/suggestionsVw.js

@@ -16,7 +16,7 @@ module.exports = baseVw.extend({
 
   lastQuery: '',
   list: [],
-  selectedOnEnter: false,
+  //selectedOnEnter: false,
   type: '',
   visible: false,
 
@@ -40,7 +40,7 @@ module.exports = baseVw.extend({
     this.$input.on('keyup.local', function(e){
       var keyCode = e.keyCode || e.which;
 
-      if (e.keyCode == 13) {
+      if (keyCode == 13) {
         self.selectItemOnEnter();
       } else {
         self.showBox(e, $(this).val());
@@ -122,17 +122,15 @@ module.exports = baseVw.extend({
   selectItemOnEnter: function() {
     var $selected = this.$('a.selected');
 
-    this.selectedOnEnter = true;
+    //this.selectedOnEnter = true;
 
     app.hideOverlay();
     this.hideSuggestions();
 
-    if (typeof $selected !== 'undefined' && $selected.length) {      
+    if (typeof $selected !== 'undefined' && $selected.length) {
       Backbone.history.navigate($selected.attr('href'), {
         trigger: true
       });
-      
-      return;
     }
   },
 
@@ -201,12 +199,12 @@ module.exports = baseVw.extend({
     this.list = [];
 
     switch (this.type) {
-      case 'handles':
-        this.list = this.findInHandlesList(query);
-        break;
-      case 'tags':
-        this.list = this.findInTagsList(query);
-        break;
+    case 'handles':
+      this.list = this.findInHandlesList(query);
+      break;
+    case 'tags':
+      this.list = this.findInTagsList(query);
+      break;
     }
 
     return this.list;
@@ -224,23 +222,19 @@ module.exports = baseVw.extend({
 
   itemTitle: function(item) {
     switch (this.type) {
-      case 'handles':
-        return item.handle + ' – ' + item.name;
-        break;
-      case 'tags':
-        return item.startsWith('#') ? item : '#' + item;
-        break;
+    case 'handles':
+      return item.handle + ' – ' + item.name;
+    case 'tags':
+      return item.startsWith('#') ? item : '#' + item;
     }
   },
 
   itemUrl: function(item) {
     switch (this.type) {
-      case 'handles':
-        return '#userPage/' + item.guid + '/store';
-        break;
-      case 'tags':
-        return '#home/products/' + (item.startsWith('#') ? item.substr(1, item.length) : item);
-        break;
+    case 'handles':
+      return '#userPage/' + item.guid + '/store';
+    case 'tags':
+      return '#home/products/' + (item.startsWith('#') ? item.substr(1, item.length) : item);
     }
   },
 
@@ -249,13 +243,16 @@ module.exports = baseVw.extend({
   },
 
   wasSelectedOnEnter: function() {
+    /*
     if (this.selectedOnEnter) {
       this.selectedOnEnter = false;
       
       return true;
     }
     
     return false;
+    */
+    return this.$('a.selected').length;
   },
 
   remove: function() {