Updated to lock the navbar on changeMode

2 files changed, 12 insertions, 1 deletions

diff --git a/public/js/index.js b/public/js/index.js
index 26fc0cc8..a902a6fb 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -550,6 +550,7 @@ function toggleMode() {
 }
 
 function changeMode(type) {
+    lockNavbar();
     saveInfo();
     if (type)
         currentMode = type;
@@ -616,6 +617,16 @@ function changeMode(type) {
         ui.toolbar.view.addClass("active");
         modeIcon.addClass('fa-toggle-on');
     }
+    unlockNavbar();
+}
+
+function lockNavbar() {
+    $('.navbar').addClass('locked');
+}
+
+var unlockNavbar = _.debounce(function () {
+    $('.navbar').removeClass('locked');
+}, 200);
 }
 
 //button actions
diff --git a/public/vendor/showup/showup.js b/public/vendor/showup/showup.js
index f4f2267e..da987858 100755
--- a/public/vendor/showup/showup.js
+++ b/public/vendor/showup/showup.js
@@ -36,7 +36,7 @@
 		target.clearQueue();
 		target.stop();
 	  var currentScroll = $(this).scrollTop();
-      if (currentScroll > hideOffset) {
+      if (currentScroll > hideOffset && !target.hasClass('locked')) {
           if(Math.abs(previousScroll - currentScroll) < 50) return;
         if (currentScroll > previousScroll) {
           // Action on scroll down