summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Cheng-Han2015-09-24 13:55:02 +0800
committerWu Cheng-Han2015-09-24 13:55:02 +0800
commit33cdec2fd4c124e181356be81a756aa6824c4ec2 (patch)
tree2b5e7b93ebcf138ecb0b928e824258698b45ff61
parentc9f35b9aa0782c7e765ca0e71196db11356caed1 (diff)
Updated to lock the navbar on changeMode
-rw-r--r--public/js/index.js11
-rwxr-xr-xpublic/vendor/showup/showup.js2
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