Merge pull request #1421 from OpenBazaar/pr/1419

Pr/1419

Author: jjeffryes

css/obBase.css

@@ -2583,11 +2583,6 @@ div.chatSearchOut .chatSearchIcon {
   border-top-right-radius: 0;
 }
 
-.btn.btn-back:before,
-.btn.btn-fwd:before {
-  opacity: 0.3;
-}
-
 .btn.btn-back.active:before,
 .btn.btn-fwd.active:before {
   opacity: 1;
@@ -5872,7 +5867,31 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 
 #ov1.notFancy .notFancyDarkBackground,
 #ov1.notFancy #obContainer .notFancyDarkBackground {
-  background: #262626;
+  background: #262626 !important;
+}
+
+#ov1.notFancy .disabled,
+#ov1.notFancy #userPage .disabled,
+#ov1.notFancy #obContainer .disabled,
+#ov1.notFancy #overlay .disabled,
+#ov1.notFancy #sideBar .disabled,
+#ov1.notFancy #pageNav .disabled,
+#ov1.notFancy #modalHolder .disabled,
+#ov1.notFancy #messageModal .disabled,
+#ov1.notFancy #statusBar .disabled {
+  opacity: 0.2 !important;
+}
+
+#ov1.notFancy .disabled2,
+#ov1.notFancy #userPage .disabled2,
+#ov1.notFancy #obContainer .disabled2,
+#ov1.notFancy #overlay .disabled2,
+#ov1.notFancy #sideBar .disabled2,
+#ov1.notFancy #pageNav .disabled2,
+#ov1.notFancy #modalHolder .disabled2,
+#ov1.notFancy #messageModal .disabled2,
+#ov1.notFancy #statusBar .disabled2 {
+  opacity: 0.7 !important;
 }
 
 /* add a shadow and a glow, so modal close buttons are still barely visible if the user picks a bad color */

js/router.js

@@ -48,6 +48,9 @@ module.exports = Backbone.Router.extend({
         this.navigate(translatedRoute, { trigger: true });
       });
     });
+    history.size = -1;
+    history.position = -1;
+    history.action = 'default';
   },
 
   translateRoute: function(route) {
@@ -103,6 +106,32 @@ module.exports = Backbone.Router.extend({
 
     return deferred.promise();
   },
+  
+  execute: function(callback, args, name) {
+    if (history.action == 'default') {
+      history.position += 1;
+      history.size = history.position;
+    } else if (history.action == 'back') {
+      history.position -= 1;
+    } else if(history.action == 'forward' && this.previousName != name && name != "index") {
+      //don't increment if the same state is navigated to twice
+      //don't increment on index since that isn't a real state
+        history.position += 1;
+    }
+    history.action = 'default';
+
+    if (history.position == history.size)
+        $('.js-navFwd').addClass('disabled');
+    else
+        $('.js-navFwd').removeClass('disabled');
+    
+    if (history.position == 1)
+        $('.js-navBack').addClass('disabled');
+    else
+        $('.js-navBack').removeClass('disabled');
+    
+    if (callback) callback.apply(this, args);
+  },
 
   cleanup: function(){
     "use strict";

js/views/homeVw.js

@@ -290,10 +290,10 @@ module.exports = baseVw.extend({
       this.searchItemsText = searchItemsText;
 
       //add action to history
-      Backbone.history.navigate("#home/" + state + "/" + searchItemsText.replace(/ /g, ""));
+      Backbone.history.navigate("#home/" + state + "/" + searchItemsText.replace(/ /g, ""), { replace: true });
     } else {
       //add action to history
-      Backbone.history.navigate("#home/" + state);
+      Backbone.history.navigate("#home/" + state, { replace: true });
     }
 
     this.state = state;

js/views/pageNavVw.js

@@ -501,11 +501,13 @@ module.exports = baseVw.extend({
   },
 
   navBackClick: function(){
-    window.history.back();
+    history.action = 'back';
+    history.back();
   },
 
   navFwdClick: function(){
-    window.history.forward();
+    history.action = 'forward';
+    history.forward();
   },
 
   navRefreshClick: function(){

js/views/settingsVw.js

@@ -528,7 +528,7 @@ module.exports = Backbone.View.extend({
 
   addTabToHistory: function(state){
     //add action to history
-    Backbone.history.navigate("#settings/" + state);
+    Backbone.history.navigate("#settings/" + state, { replace: true });
     this.options.state = state;
   },