mirror of
https://github.com/Hopiu/jquery-mobile.git
synced 2026-05-21 12:51:51 +00:00
modified manageglobalnav function to work based on a passed element argument
This commit is contained in:
parent
ad7b3a2293
commit
b351290a9c
1 changed files with 5 additions and 5 deletions
|
|
@ -45,8 +45,8 @@
|
|||
}, 150 );
|
||||
}
|
||||
|
||||
function manageGlobalNav(){
|
||||
if($('.ui-page-active:last').is('.ui-globalnav-expanded')){
|
||||
function manageGlobalNav(activePage){
|
||||
if(activePage.is('.ui-globalnav-expanded')){
|
||||
$('[data-role="globalnav"]').addClass('ui-globalnav-disable');
|
||||
}
|
||||
else{
|
||||
|
|
@ -101,14 +101,14 @@
|
|||
to.appendTo($body).addClass( activePageClass + " " + transition +
|
||||
" in " + ( back ? "reverse" : "" ) );
|
||||
//make sure globalnav is on top
|
||||
$('[data-role="globalnav"]').appendTo($body);
|
||||
$('[data-role="globalnav"]').appendTo($body);
|
||||
manageGlobalNav(to);
|
||||
|
||||
// callback - remove classes, etc
|
||||
to.animationComplete(function() {
|
||||
from.add( to ).removeClass(" out in reverse " + transitions );
|
||||
from.removeClass( activePageClass );
|
||||
pageLoading( true );
|
||||
manageGlobalNav();
|
||||
$.fixedToolbars.show();
|
||||
});
|
||||
};
|
||||
|
|
@ -183,7 +183,7 @@
|
|||
changePage( currentPage, startPage, transition, back );
|
||||
} else {
|
||||
startPage.addClass( activePageClass );
|
||||
manageGlobalNav();
|
||||
manageGlobalNav(startPage);
|
||||
$.fixedToolbars.show();
|
||||
pageLoading( true );
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue