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

Allow to fully customize click and submit handling

Browse Source 
resolves #3767
This commit is contained in:
Loei Petrus Marogi 2019-05-27 11:03:49 +02:00
parent 96f3807610
commit 302422d814
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/icinga/behavior/actiontable.js
View File

@ -378,6 +378,10 @@
var $tr = $(event.currentTarget); var $tr = $(event.currentTarget);
var table = new Selection($tr.closest('table.action, table.table-row-selectable')[0], _this.icinga); var table = new Selection($tr.closest('table.action, table.table-row-selectable')[0], _this.icinga);
if ($tr.closest('[data-no-icinga-ajax]').length > 0) {
return true;
}
// some rows may contain form actions that trigger a different action, pass those through // some rows may contain form actions that trigger a different action, pass those through
if (!$target.hasClass('rowaction') && $target.closest('form').length && if (!$target.hasClass('rowaction') && $target.closest('form').length &&
($target.closest('a').length || // allow regular link clinks ($target.closest('a').length || // allow regular link clinks

8
public/js/icinga/events.js
View File

@ -249,6 +249,10 @@
$form.removeData('submitButton'); $form.removeData('submitButton');
} }
if ($form.closest('[data-no-icinga-ajax]').length > 0) {
return true;
}
if ($button.length === 0) { if ($button.length === 0) {
var $el; var $el;
@ -457,6 +461,10 @@
return true; return true;
} }
if ($a.closest('[data-no-icinga-ajax]').length > 0) {
return true;
}
// Check for ctrl or cmd click to open new tab unless clicking on a multiselect row // Check for ctrl or cmd click to open new tab unless clicking on a multiselect row
if ((event.ctrlKey || event.metaKey) && href !== '#' && $a.is('a')) { if ((event.ctrlKey || event.metaKey) && href !== '#' && $a.is('a')) {
window.open(href, linkTarget); window.open(href, linkTarget);