tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tell navigation behavior about changes in active menus

Browse Source 
fixes #7181
This commit is contained in:
Matthias Jentsch 2014-09-12 15:01:25 +02:00
parent 1932a912f8
commit 7f0a2d540b
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/js/icinga/behavior/navigation.js
View File

@ -27,7 +27,7 @@
// restore old menu state // restore old menu state
if (activeMenuId) { if (activeMenuId) {
$('[role="navigation"] li.active', el).removeClass('active'); $('[role="navigation"] li.active', el).removeClass('active');
var $selectedMenu = $('#' + activeMenuId, el).addClass('active'); var $selectedMenu = $('#' + activeMenuId).addClass('active');
var $outerMenu = $selectedMenu.parent().closest('li'); var $outerMenu = $selectedMenu.parent().closest('li');
if ($outerMenu.size()) { if ($outerMenu.size()) {
$outerMenu.addClass('active'); $outerMenu.addClass('active');
@ -74,6 +74,23 @@
$menu.data('icinga-url', menuDataUrl); $menu.data('icinga-url', menuDataUrl);
}; };
/**
* Change the active menu element
*
* @param $el {jQuery} A selector pointing to the active element
*/
Navigation.prototype.setActive = function($el) {
$el.closest('li').addClass('active');
$el.parents('li').addClass('active');
activeMenuId = $el.closest('li').attr('id');
};
Navigation.prototype.resetActive = function() {
$('#menu .active').removeClass('active');
activeMenuId = null;
};
Navigation.prototype.menuTitleHovered = function(event) { Navigation.prototype.menuTitleHovered = function(event) {
var $li = $(this), var $li = $(this),
delay = 800, delay = 800,

5
public/js/icinga/loader.js
View File

@ -345,7 +345,7 @@
$matches.each(function (idx, el) { $matches.each(function (idx, el) {
if ($(el).closest('#menu').length) { if ($(el).closest('#menu').length) {
$('#menu .active').removeClass('active'); self.icinga.behaviors.navigation.resetActive();
} else if ($(el).closest('table.action').length) { } else if ($(el).closest('table.action').length) {
$(el).closest('table.action').find('.active').removeClass('active'); $(el).closest('table.action').find('.active').removeClass('active');
} }
@ -357,8 +357,7 @@
if ($el.is('form')) { if ($el.is('form')) {
$('input', $el).addClass('active'); $('input', $el).addClass('active');
} else { } else {
$el.closest('li').addClass('active'); self.icinga.behaviors.navigation.setActive($el);
$el.parents('li').addClass('active');
} }
// Interrupt .each, only on menu item shall be active // Interrupt .each, only on menu item shall be active
return false; return false;