From 589c423f3d2d4d65347fbd074b71cc067541c477 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 3 Sep 2019 19:28:50 +0200 Subject: actually get scrolling working! --- StoneIsland/www/js/lib/nav/CurtainView.js | 2 +- StoneIsland/www/js/lib/nav/NavView.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'StoneIsland/www/js/lib/nav') diff --git a/StoneIsland/www/js/lib/nav/CurtainView.js b/StoneIsland/www/js/lib/nav/CurtainView.js index d444fd60..ddb6bc19 100755 --- a/StoneIsland/www/js/lib/nav/CurtainView.js +++ b/StoneIsland/www/js/lib/nav/CurtainView.js @@ -28,7 +28,7 @@ var CurtainView = View.extend({ }, click: function(){ - if (document.body.classList.contains("nav")) { + if (document.body.classList.contains("nav") && !app.accessible) { app.nav.hide() } if (app.selector.visible) { diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js index 958bc8ad..1655b7f8 100755 --- a/StoneIsland/www/js/lib/nav/NavView.js +++ b/StoneIsland/www/js/lib/nav/NavView.js @@ -45,6 +45,10 @@ var NavView = View.extend({ show: function(klass){ $("body").addClass("nav") app.curtain.show("dark") + doneShowingNav = false + setTimeout(function(){ + doneShowingNav = true + }, 800) if (klass) { setTimeout(function(){ this.addClass(klass) @@ -53,6 +57,7 @@ var NavView = View.extend({ }, hide: function(){ + if (!doneShowingNav) return $("body").removeClass("nav") app.curtain.hide("dark") }, -- cgit v1.2.3-70-g09d2