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

Fix activating search items in navigation

Browse Source 
Support activating search input fields in navigation.js,
improve setActiveByUrl to recognize search input urls.

refs #9761
This commit is contained in:
Matthias Jentsch 2015-08-26 11:40:10 +02:00
parent 6a43dd9e0e
commit d88336dc39
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,9 @@
* *
* fixes #7897 * fixes #7897
*/ */
$el.html($el.html()); if ($el.is('li')) {
$el.html($el.html());
}
} }
// restore hovered menu to current hovered element // restore hovered menu to current hovered element
@ -145,6 +147,11 @@
// try to active the first item that has an exact URL match // try to active the first item that has an exact URL match
this.setActive($('#menu [href="' + url + '"]')); this.setActive($('#menu [href="' + url + '"]'));
// the url may point to the search field, which must be activated too
if (! this.active) {
this.setActive($('#menu form[action="' + this.icinga.utils.parseUrl(url).path + '"]'));
}
// some urls may have custom filters which won't match any menu item, in that case search // some urls may have custom filters which won't match any menu item, in that case search
// for a menu item that points to the base action without any filters // for a menu item that points to the base action without any filters
if (! this.active) { if (! this.active) {
@ -175,7 +182,11 @@
* Remove all active elements * Remove all active elements
*/ */
Navigation.prototype.clear = function() { Navigation.prototype.clear = function() {
// menu items
$('#menu li.active', this.element).removeClass('active'); $('#menu li.active', this.element).removeClass('active');
// search fields
$('#menu input.active', this.element).removeClass('active');
}; };
/** /**
@ -185,15 +196,20 @@
*/ */
Navigation.prototype.select = function($item) { Navigation.prototype.select = function($item) {
// support selecting the url of the menu entry // support selecting the url of the menu entry
var $input = $item.find('input');
$item = $item.closest('li'); $item = $item.closest('li');
// select the current item if ($item.length) {
var $selectedMenu = $item.addClass('active'); // select the current item
var $selectedMenu = $item.addClass('active');
// unfold the containing menu // unfold the containing menu
var $outerMenu = $selectedMenu.parent().closest('li'); var $outerMenu = $selectedMenu.parent().closest('li');
if ($outerMenu.size()) { if ($outerMenu.size()) {
$outerMenu.addClass('active'); $outerMenu.addClass('active');
}
} else if ($input.length) {
$input.addClass('active');
} }
}; };
@ -207,6 +223,8 @@
this.select($el); this.select($el);
if ($el.closest('li')[0]) { if ($el.closest('li')[0]) {
this.active = this.icinga.utils.getDomPath($el.closest('li')[0]); this.active = this.icinga.utils.getDomPath($el.closest('li')[0]);
} else if ($el.find('input')[0]) {
this.active = this.icinga.utils.getDomPath($el[0]);
} else { } else {
this.active = null; this.active = null;
} }