Merge pull request #1054 from rmisio/tweaks

Tweaks

Author: jjeffryes

js/templates/pageConnectModal.html

@@ -5,7 +5,7 @@
   </div>
 
   <div class="content">
-    <div class="statusText pad10 marginBottom12 inlineBlock <% ob.tooltip && print('tooltip') %>" <% ob.tooltip && print(`data-tooltip="${ob.tooltip}"`) %>><%= ob.statusText %></div>
+    <div class="statusText pad10 marginBottom12 inlineBlock custCol-text <% ob.tooltip && print('tooltip') %>" <% ob.tooltip && print(`data-tooltip="${ob.tooltip}"`) %>><%= ob.statusText %></div>
 
     <div>
       <a class="btn btn-large custCol-secondary js-cancel btn-cancel">Cancel</a>

js/views/pageConnectModal.js

@@ -39,17 +39,15 @@ module.exports = baseModal.extend({
     }
   },
 
-  onBackClick: function(e) {
-    $(e.target).addClass('disabled');
+  onBackClick: function() {
     this.trigger('back');
   },
 
   onRetryClick: function() {
     this.trigger('retry');
   },
 
-  onCancelClick: function(e) {
-    $(e.target).addClass('disabled');
+  onCancelClick: function() {
     this.trigger('cancel');
   },    
 

js/views/userPageVw.js

@@ -363,7 +363,7 @@ module.exports = baseVw.extend({
       self.undoCustomAttributes.secondary_color = self.model.get('page').profile.secondary_color;
       self.undoCustomAttributes.text_color = self.model.get('page').profile.text_color;
       self.setCustomStyles();
-      self.setState(self.state, self.currentItemHash);
+      self.setState(self.state, self.currentItemHash, { replaceHistory: true });
 
       //check if user is blocked
       if(!self.options.ownPage && isBlocked) {
@@ -445,13 +445,15 @@ module.exports = baseVw.extend({
     }
   },
 
-  setState: function(state, hash) {
+  setState: function(state, hash, options) {
     "use strict";
     var currentAddress,
         addressState,
         currentHandle = this.model.get('page').profile.handle,
         isItemType = false;
 
+    options = options || {};
+
     if(state === "listing"){
       //clear old templates
       this.$el.find('.js-list4').html("");
@@ -463,19 +465,19 @@ module.exports = baseVw.extend({
     }else if(state === "listingNew"){
       this.tabClick(this.$el.find(".js-storeTab"), this.$el.find(".js-store"));
       $('#obContainer').scrollTop(352);
-      this.addTabToHistory('listingNew');
+      this.addTabToHistory('listingNew', options.replaceHistory);
       this.sellItem();
     } else if(state === "createStore") {
       this.tabClick(this.$el.find(".js-aboutTab"), this.$el.find(".js-about"));
-      this.addTabToHistory('about');
+      this.addTabToHistory('about', options.replaceHistory);
       this.createStore();
     } else if(state === "becomeModerator"){
       this.tabClick(this.$el.find(".js-aboutTab"), this.$el.find(".js-about"));
-      this.addTabToHistory('about');
+      this.addTabToHistory('about', options.replaceHistory);
       this.showModeratorModal();
     } else if(state === "customize"){
       this.tabClick(this.$el.find(".js-aboutTab"), this.$el.find(".js-about"));
-      this.addTabToHistory('about');
+      this.addTabToHistory('about', options.replaceHistory);
       this.customizePage();
     }else if(state == "store"){
       //if this page is not a vendor, don't go to their store
@@ -485,7 +487,7 @@ module.exports = baseVw.extend({
         state="about";
       }
       this.tabClick(this.$el.find(".js-" + state + "Tab"), this.$el.find(".js-" + state));
-      this.addTabToHistory(state);
+      this.addTabToHistory(state, options.replaceHistory);
     }else if(state){
       this.tabClick(this.$el.find(".js-" + state + "Tab"), this.$el.find(".js-" + state));
     }else{
@@ -949,10 +951,10 @@ module.exports = baseVw.extend({
     showContent.removeClass('hide');
   },
 
-  addTabToHistory: function(state){
+  addTabToHistory: function(state, replace){
     "use strict";
     //add action to history if not an item
-    Backbone.history.navigate('#userPage/'+this.model.get('page').profile.guid + "/" + state);
+    Backbone.history.navigate('#userPage/'+this.model.get('page').profile.guid + "/" + state, { replace: true });
   },
 
   sellItem: function(){