Regatten.net/RegattenApp
1
0
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

Menu close on back improved

Browse Source
This commit is contained in:
ostertun
2020-11-01 16:45:00 +01:00
parent 1fb619d4ec
commit cd30ba1ce6
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
client/scripts/custom.js.php
View File

@@ -124,29 +124,22 @@ $(document).ready(function(){
//Adding Background for Gradient //Adding Background for Gradient
if(!$('.menu-hider').length){$('#page').append('<div class="menu-hider"><div>');} if(!$('.menu-hider').length){$('#page').append('<div class="menu-hider"><div>');}
var menuOpened = function() { history.pushState(null, '');
log('[tpl] Menu opened', history.state); log('[tpl] state pushed');
if ((history.state === null) || (history.state.menu !== 'opened')) {
history.pushState({ menu: 'opened' }, '');
log('[tpl] state pushed');
}
}
var menuClosed = function() {
log('[tpl] Menu closed', history.state);
if ((history.state !== null) && (history.state.menu === 'opened')) {
history.back();
log('[tpl] history.back')
}
}
/*Menu Extender Function*/ /*Menu Extender Function*/
$.fn.showMenu = function() {$(this).addClass('menu-active'); $('#footer-bar').addClass('footer-menu-hidden');setTimeout(function(){$('.menu-hider').addClass('menu-active');},250);$('body').addClass('modal-open');menuOpened();}; $.fn.showMenu = function() {$(this).addClass('menu-active'); $('#footer-bar').addClass('footer-menu-hidden');setTimeout(function(){$('.menu-hider').addClass('menu-active');},250);$('body').addClass('modal-open');};
$.fn.hideMenu = function() {$(this).removeClass('menu-active'); $('#footer-bar').removeClass('footer-menu-hidden');$('.menu-hider').removeClass('menu-active menu-active-clear');$('body').removeClass('modal-open');menuClosed();}; $.fn.hideMenu = function() {$(this).removeClass('menu-active'); $('#footer-bar').removeClass('footer-menu-hidden');$('.menu-hider').removeClass('menu-active menu-active-clear');$('body').removeClass('modal-open');};
window.onpopstate = function(event) { window.onpopstate = function(event) {
log('[tpl] popstate event fired. location:' + document.location + ', state:' + JSON.stringify(event.state)); var menuOpened = $('body').hasClass('modal-open');
if ((event.state === null) || (event.state.menu !== 'opened')) { log('[tpl] popstate event fired. location:' + document.location + ', state:' + JSON.stringify(event.state) + ', menuOpened:' + menuOpened);
if (menuOpened) {
$('.menu').hideMenu(); $('.menu').hideMenu();
log('Menu hidden');
} else {
log('history.back');
history.back();
} }
}; };
@@ -209,7 +202,6 @@ $(document).ready(function(){
if(menuID.hasClass('menu-box-right')){headerAndContent.css("transform", "translateX(-100%)");} if(menuID.hasClass('menu-box-right')){headerAndContent.css("transform", "translateX(-100%)");}
} }
menuActivate(); menuActivate();
menuOpened();
}); });
//Allows clicking even if menu is loaded externally. //Allows clicking even if menu is loaded externally.
@@ -221,7 +213,6 @@ $(document).ready(function(){
menuHider.css('transform','translate(0,0)'); menuHider.css('transform','translate(0,0)');
$('#footer-bar').removeClass('footer-menu-hidden'); $('#footer-bar').removeClass('footer-menu-hidden');
$('body').removeClass('modal-open'); $('body').removeClass('modal-open');
menuClosed();
return false; return false;
}); });