various bug fixes
This commit is contained in:
parent
d29da99dbd
commit
3c7419ec57
17 changed files with 174 additions and 22 deletions
|
|
@ -78,7 +78,7 @@
|
|||
if( last_popup_menu ) {
|
||||
if( '#' + last_popup_menu.attr('id') !== $j(e.target).attr('rel')) {
|
||||
last_popup_menu.hide();
|
||||
if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('section').show();
|
||||
if (last_popup_menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
|
||||
last_popup_button.removeClass("selected");
|
||||
last_popup_menu = null;
|
||||
last_popup_button = null;
|
||||
|
|
@ -100,13 +100,13 @@
|
|||
if (menu.css("display") == "none") {
|
||||
$j(this).parent().addClass("selected");
|
||||
menu.show();
|
||||
if (menu.attr('id') == "nav-notifications-menu" ) $j('section').hide();
|
||||
if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').hide();
|
||||
last_popup_menu = menu;
|
||||
last_popup_button = $j(this).parent();
|
||||
} else {
|
||||
$j(this).parent().removeClass("selected");
|
||||
menu.hide();
|
||||
if (menu.attr('id') == "nav-notifications-menu" ) $j('section').show();
|
||||
if (menu.attr('id') == "nav-notifications-menu" ) $j('.main-container').show();
|
||||
last_popup_menu = null;
|
||||
last_popup_button = null;
|
||||
}
|
||||
|
|
|
|||
2
view/theme/frost-mobile/js/main.min.js
vendored
2
view/theme/frost-mobile/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -49,7 +49,7 @@ $j(document).ready(function() {
|
|||
}
|
||||
}
|
||||
|
||||
if(typeof acl=="undefined"){
|
||||
if(typeof window.aclInit !="undefined" && typeof acl=="undefined"){
|
||||
acl = new ACL(
|
||||
baseurl+"/acl",
|
||||
[ window.allowCID,window.allowGID,window.denyCID,window.denyGID ]
|
||||
|
|
|
|||
2
view/theme/frost-mobile/js/theme.min.js
vendored
2
view/theme/frost-mobile/js/theme.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue