Refactor run button initialization and timepicker usage

- Removed the `initTimepicker()` function call from `document.addEventListener` block
- Added a new line to initialize `selecttimedatepicker` if it is undefined in the event listener for `.run` buttons
- Moved the modal show code before initializing `selecttimedatepicker`
- Removed duplicate modal show code from `initRunButtons()` function
This commit is contained in:
Jeroen De Meerleer 2023-09-03 12:53:44 +02:00
parent 7ac00a622e
commit 90d0cfd1c8
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
2 changed files with 6 additions and 4 deletions

View File

@ -9,7 +9,6 @@ document.addEventListener("readystatechange", event => {
if(event.target.readyState === 'complete') { if(event.target.readyState === 'complete') {
initDeleteButtons(); initDeleteButtons();
initRunButtons(); initRunButtons();
initTimepicker();
Utils.initTags(); Utils.initTags();
} }
}); });
@ -45,6 +44,10 @@ function initTimepicker() {
} }
function initRunButtons() { function initRunButtons() {
document.querySelectorAll('.run').forEach(elem => elem.addEventListener("click", event => { document.querySelectorAll('.run').forEach(elem => elem.addEventListener("click", event => {
var bsModal = new Modal('#run_selecttime');
bsModal.show();
if(typeof selecttimedatepicker === 'undefined') initTimepicker()
let me = event.currentTarget; let me = event.currentTarget;
let norun = me.closest('tr').classList.contains('norun') let norun = me.closest('tr').classList.contains('norun')
let maxdate = new DateTime(me.dataset.nextrun) let maxdate = new DateTime(me.dataset.nextrun)
@ -66,9 +69,6 @@ function initRunButtons() {
} }
}) })
var bsModal = new Modal('#run_selecttime');
bsModal.show();
let schedulefn = event => { let schedulefn = event => {
bsModal.hide(); bsModal.hide();
let time = Math.floor(selecttimedatepicker.dates.lastPicked / 1000); let time = Math.floor(selecttimedatepicker.dates.lastPicked / 1000);

View File

@ -50,6 +50,8 @@ nelmio_security:
- 'data:' - 'data:'
connect-src: connect-src:
- 'self' - 'self'
base-uri:
- 'none'
block-all-mixed-content: true # defaults to false, blocks HTTP content over HTTPS transport block-all-mixed-content: true # defaults to false, blocks HTTP content over HTTPS transport
# upgrade-insecure-requests: true # defaults to false, upgrades HTTP requests to HTTPS transport # upgrade-insecure-requests: true # defaults to false, upgrades HTTP requests to HTTPS transport
report: report: