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

Fix selection when clicking on regular links

Browse Source 
refs #9054
refs #9346
This commit is contained in:
Matthias Jentsch 2015-06-29 18:51:32 +02:00
parent aec59d9941
commit 96677fb6c7
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,9 +117,6 @@
$(document).on('click', 'a', { self: this }, this.linkClicked); $(document).on('click', 'a', { self: this }, this.linkClicked);
$(document).on('click', 'tr[href]', { self: this }, this.linkClicked); $(document).on('click', 'tr[href]', { self: this }, this.linkClicked);
// Select a table row
$(document).on('click', 'table.multiselect tr[href]', { self: this }, this.rowSelected);
// We catch all form submit events // We catch all form submit events
$(document).on('submit', 'form', { self: this }, this.submitForm); $(document).on('submit', 'form', { self: this }, this.submitForm);
@ -304,12 +301,6 @@
return false; return false;
}, },
/**
* Handle table selection.
*/
rowSelected: function(event) {
},
/** /**
* Handle anchor, i.e. focus the element which is referenced by the anchor * Handle anchor, i.e. focus the element which is referenced by the anchor
* *
@ -345,16 +336,16 @@
// Special checks for link clicks in multiselect rows // Special checks for link clicks in multiselect rows
if (! $a.is('tr[href]') && $a.closest('tr[href]').length > 0 && $a.closest('table.multiselect').length > 0) { if (! $a.is('tr[href]') && $a.closest('tr[href]').length > 0 && $a.closest('table.multiselect').length > 0) {
// Forward clicks to ANY link with special key pressed to rowSelected // ignoray clicks to ANY link with special key pressed
if (event.ctrlKey || event.metaKey || event.shiftKey) if (event.ctrlKey || event.metaKey || event.shiftKey)
{ {
return self.rowSelected.call($a.closest('tr[href]'), event); return true;
} }
// Forward inner links matching the row URL to rowSelected // ignore inner links matching the row URL
if ($a.attr('href') === $a.closest('tr[href]').attr('href')) if ($a.attr('href') === $a.closest('tr[href]').attr('href'))
{ {
return self.rowSelected.call($a.closest('tr[href]'), event); return true;
} }
} }
@ -513,8 +504,6 @@
$(window).off('beforeunload', this.onUnload); $(window).off('beforeunload', this.onUnload);
$(document).off('scroll', '.container', this.onContainerScroll); $(document).off('scroll', '.container', this.onContainerScroll);
$(document).off('click', 'a', this.linkClicked); $(document).off('click', 'a', this.linkClicked);
$(document).off('click', 'table.action tr[href]', this.rowSelected);
$(document).off('click', 'table.action tr a', this.rowSelected);
$(document).off('submit', 'form', this.submitForm); $(document).off('submit', 'form', this.submitForm);
$(document).off('change', 'form select.autosubmit', this.submitForm); $(document).off('change', 'form select.autosubmit', this.submitForm);
$(document).off('change', 'form input.autosubmit', this.submitForm); $(document).off('change', 'form input.autosubmit', this.submitForm);