iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace jQuery ready

This commit is contained in:
Michael Weimann 2022-11-29 19:19:30 +01:00
parent 6917f7805b
commit 7bbdb95885
No known key found for this signature in database
GPG Key ID: 34F0524D4DA694A1
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/countdown.js
View File

@ -1,3 +1,5 @@
import { ready } from './ready';
const lang = document.documentElement.getAttribute('lang'); const lang = document.documentElement.getAttribute('lang');
const templateFuture = 'in %value %unit'; const templateFuture = 'in %value %unit';
@ -67,7 +69,7 @@ function formatFromNow(timestamp) {
/** /**
* Initialises all countdown fields on the page. * Initialises all countdown fields on the page.
*/ */
$(function () { ready(function () {
$.each($('[data-countdown-ts]'), function (i, e) { $.each($('[data-countdown-ts]'), function (i, e) {
const span = $(e); const span = $(e);
const timestamp = span.data('countdown-ts'); const timestamp = span.data('countdown-ts');

13
resources/assets/js/forms.js
View File

@ -1,5 +1,6 @@
require('select2'); require('select2');
import { formatDay, formatTime } from './date'; import { formatDay, formatTime } from './date';
import { ready } from './ready';
/** /**
* Sets all checkboxes to the wanted state * Sets all checkboxes to the wanted state
@ -85,7 +86,7 @@ global.setHours = (hours) => {
setInput(from, to); setInput(from, to);
}; };
$(function () { ready(function () {
/** /**
* Disable every submit button after clicking (to prevent double-clicking) * Disable every submit button after clicking (to prevent double-clicking)
*/ */
@ -99,7 +100,7 @@ $(function () {
/* /*
* Button to set current time in time input fields. * Button to set current time in time input fields.
*/ */
$(function () { ready(function () {
$('.input-group.time').each(function () { $('.input-group.time').each(function () {
const elem = $(this); const elem = $(this);
elem.find('button').on('click', function () { elem.find('button').on('click', function () {
@ -119,7 +120,7 @@ $(function () {
}); });
}); });
$(function () { ready(function () {
$('select').select2({ $('select').select2({
theme: 'bootstrap-5', theme: 'bootstrap-5',
width: '100%', width: '100%',
@ -129,7 +130,7 @@ $(function () {
/** /**
* Show oauth buttons on welcome title click * Show oauth buttons on welcome title click
*/ */
$(function () { ready(function () {
$('#welcome-title').on('click', function () { $('#welcome-title').on('click', function () {
$('.btn-group.btn-group .btn.d-none').removeClass('d-none'); $('.btn-group.btn-group .btn.d-none').removeClass('d-none');
}); });
@ -146,7 +147,7 @@ $(function () {
* *
* Uses DOMContentLoaded to prevent flickering * Uses DOMContentLoaded to prevent flickering
*/ */
window.addEventListener('DOMContentLoaded', () => { ready(() => {
const filter = document.getElementById('collapseShiftsFilterSelect'); const filter = document.getElementById('collapseShiftsFilterSelect');
if (!filter || localStorage.getItem('collapseShiftsFilterSelect') !== 'hidden') { if (!filter || localStorage.getItem('collapseShiftsFilterSelect') !== 'hidden') {
return; return;
@ -155,7 +156,7 @@ window.addEventListener('DOMContentLoaded', () => {
filter.classList.remove('show'); filter.classList.remove('show');
}); });
$(() => { ready(() => {
if (typeof (localStorage) === 'undefined') { if (typeof (localStorage) === 'undefined') {
return; return;
} }

7
resources/assets/js/ready.js Normal file
View File

@ -0,0 +1,7 @@
export const ready = (callback) => {
if (document.readyState !== 'loading') {
callback();
} else {
document.addEventListener('DOMContentLoaded', callback);
}
}

4
resources/assets/js/sticky-headers.js
View File

@ -1,7 +1,9 @@
import { ready } from './ready';
/** /**
* Enables the fixed headers and time lane for the shift-calendar and datatables * Enables the fixed headers and time lane for the shift-calendar and datatables
*/ */
$(function () { ready(function () {
if ($('.shift-calendar').length) { if ($('.shift-calendar').length) {
const timeLanes = $('.shift-calendar .time'); const timeLanes = $('.shift-calendar .time');
const headers = $('.shift-calendar .header'); const headers = $('.shift-calendar .header');

1
resources/assets/js/vendor.js
View File

@ -5,6 +5,7 @@ require('./forms');
require('./sticky-headers'); require('./sticky-headers');
require('./countdown'); require('./countdown');
$.ajaxSetup({ $.ajaxSetup({
headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')} headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')}
}); });