tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issues with click targets 

refs #4611
This commit is contained in:
Jannis Moßhammer 2013-09-21 17:59:27 +02:00
parent 4206504c9c
commit 3e195501ac
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/layouts/scripts/parts/topbar.phtml
View File

@ -21,7 +21,6 @@
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
test
<li id="icinga_app_nav_preferences"> <li id="icinga_app_nav_preferences">
<a href="<?= $this->href('/preference'); ?>"><?= $this->translate('Preferences'); ?> </a> <a href="<?= $this->href('/preference'); ?>"><?= $this->translate('Preferences'); ?> </a>
</li> </li>

4
public/js/icinga/components/container.js
View File

@ -422,7 +422,9 @@ define(['jquery', 'logging', 'icinga/componentLoader', 'URIjs/URI', 'URIjs/URITe
} else { } else {
var container = new Container($(targetEl)); var container = new Container($(targetEl));
// detail links render to main by default; // detail links render to main by default;
Icinga.replaceBodyFromUrl(URI($(targetEl).attr('href')).href()); Icinga.replaceBodyFromUrl(
container.updateContainerHref(URI($(targetEl).attr('href')).href())
);
ev.preventDefault(); ev.preventDefault();
ev.stopPropagation(); ev.stopPropagation();

2
public/js/icinga/icinga.js
View File

@ -90,7 +90,7 @@ define([
}; };
if (Modernizr.history) { if (Modernizr.history) {
$(document.body).on('click', '#icinganavigation, #icingatopbar', function(ev) { $(document.body).on('click', '#icinganavigation', function(ev) {
var targetEl = ev.target || ev.toElement || ev.relatedTarget; var targetEl = ev.target || ev.toElement || ev.relatedTarget;
if (targetEl.tagName.toLowerCase() !== 'a') { if (targetEl.tagName.toLowerCase() !== 'a') {
return true; return true;