jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

various code improvements (#1415)

Browse Source
This commit is contained in:
Kevin Papst
2020-01-28 21:57:34 +01:00
committed by GitHub
parent 79c4c237fa
commit a1b554b3ac
16 changed files with 103 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/plugins/KimaiAjaxModalForm.js
View File

@@ -13,9 +13,9 @@
*/
import jQuery from 'jquery';
import KimaiClickHandlerReducedInTableRow from "./KimaiClickHandlerReducedInTableRow";
import KimaiReducedClickHandler from "./KimaiReducedClickHandler";
export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableRow {
export default class KimaiAjaxModalForm extends KimaiReducedClickHandler {
constructor(selector) {
super();
@@ -47,7 +47,7 @@ export default class KimaiAjaxModalForm extends KimaiClickHandlerReducedInTableR
jQuery(self._getFormIdentifier()).find('input[type=text],textarea,select').filter(':not("[data-datetimepicker=on]")').filter(':visible:first').focus().delay(1000).focus();
});
this._addClickHandlerReducedInTableRow(this.selector, function(href) {
this._addClickHandler(this.selector, function(href) {
self.openUrlInModal(href);
});
}

6
assets/js/plugins/KimaiAlternativeLinks.js
View File

@@ -13,9 +13,9 @@
*/
import jQuery from 'jquery';
import KimaiClickHandlerReducedInTableRow from "./KimaiClickHandlerReducedInTableRow";
import KimaiReducedClickHandler from "./KimaiReducedClickHandler";
export default class KimaiAlternativeLinks extends KimaiClickHandlerReducedInTableRow {
export default class KimaiAlternativeLinks extends KimaiReducedClickHandler {
constructor(selector) {
super();
@@ -23,7 +23,7 @@ export default class KimaiAlternativeLinks extends KimaiClickHandlerReducedInTab
}
init() {
this._addClickHandlerReducedInTableRow(this.selector, function(href) {
this._addClickHandler(this.selector, function(href) {
window.location = href;
});
}

10
assets/js/plugins/KimaiClickHandlerReducedInTableRow.js → assets/js/plugins/KimaiReducedClickHandler.js
View File

@@ -6,24 +6,24 @@
*/
/*!
* [KIMAI] KimaiClickHandlerReducedInTableRow: abstract class
* [KIMAI] KimaiReducedClickHandler: abstract class
*/
import jQuery from 'jquery';
import KimaiPlugin from "../KimaiPlugin";
export default class KimaiClickHandlerReducedInTableRow extends KimaiPlugin {
export default class KimaiReducedClickHandler extends KimaiPlugin {
_addClickHandlerReducedInTableRow(selector, callback)  {
_addClickHandler(selector, callback)  {
jQuery('body').on('click', selector, function(event) {
// just in case an inner element is editable, than this should not be triggered
if (event.target.parentNode.isContentEditable || event.target.isContentEditable) {
return;
}
// handles the "click" on table rows to open an entry for editing
// handles the "click" on table rows or list elements
let target = event.target;
if (event.currentTarget.matches('tr')) {
if (event.currentTarget.matches('tr') || event.currentTarget.matches('li')) {
while (target !== null && !target.matches('body')) {
// when an element within the row is clicked, that can trigger stuff itself, we don't want the event to be processed
// don't act if a link, button or form element was clicked