twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-02-05 03:24:17 +00:00
Code Issues Projects Releases Wiki Activity

fixed bug: back button shows up when navigated to first modal in history

Browse Source
This commit is contained in:
Julian Steinwachs 2015-01-24 09:44:48 +01:00
parent 40246e6e65
commit 69fdace49f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/interface_common.js
View File

@ -397,20 +397,17 @@ function watchHashChange(e)
{ {
if(e!=null){ if(e!=null){
var prevurlsplit = e.oldURL.split('#'); var prevurlsplit = e.oldURL.split('#');
var newurlsplit = e.newURL.split('#'); var prevhashstring=prevurlsplit[1];
var prevhashstring=prevurlsplit[1];
if(prevurlsplit[0]==newurlsplit[0] && prevhashstring!=undefined && prevhashstring.length>0 ){ var notFirstModalView=(prevhashstring!=undefined && prevhashstring.length>0 );
var notNavigatedBackToFirstModalView=(window.history.state==null || ( window.history.state!=null && window.history.state.showCloseButton!=false ) )
if(notFirstModalView && notNavigatedBackToFirstModalView ) ){
$('.modal-back').css('display','inline'); $('.modal-back').css('display','inline');
//$('.modal-back').on('click', function(e){
//e.stopPropagation();
//e.preventDefault();
//window.location.hash = '#' + prevhashstring;
//window.history.go(-1);
//});
} else { } else {
window.history.pushState({showCloseButton:false},null,null);
$('.modal-back').css('display','none'); $('.modal-back').css('display','none');
} }