From 14727700ab8e7f4fe2e960132e8826643bf452dd Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 8 Jun 2023 08:48:18 +0100 Subject: [PATCH] Updated libraries and dev assets Signed-off-by: snipe --- package-lock.json | 14 +++++++------- package.json | 4 ++-- public/css/dist/all.css | 4 ++-- public/js/build/vendor.js | 36 +++++++++++++++++++++--------------- public/js/dist/all.js | 36 +++++++++++++++++++++--------------- public/mix-manifest.json | 6 +++--- 6 files changed, 56 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5687c3a920da..7de0d6ac5488 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2070,9 +2070,9 @@ "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==" }, "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==" }, "acorn-node": { "version": "1.8.2", @@ -3127,11 +3127,11 @@ } }, "bootstrap-datepicker": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.9.0.tgz", - "integrity": "sha1-5L/OP8zhlnh2sh3Ggz7FmUqu0JA=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.10.0.tgz", + "integrity": "sha512-lWxtSYddAQOpbAO8UhYhHLcK6425eWoSjb5JDvZU3ePHEPF6A3eUr51WKaFy4PccU19JRxUG6wEU3KdhtKfvpg==", "requires": { - "jquery": ">=1.7.1 <4.0.0" + "jquery": ">=3.4.0 <4.0.0" } }, "bootstrap-daterangepicker": { diff --git a/package.json b/package.json index f8d597b90e3d..6f007620de4b 100644 --- a/package.json +++ b/package.json @@ -26,13 +26,13 @@ "dependencies": { "@fortawesome/fontawesome-free": "^6.4.0", "acorn": "^8.8.2", - "acorn-import-assertions": "^1.8.0", + "acorn-import-assertions": "^1.9.0", "admin-lte": "^2.4.18", "ajv": "^6.12.6", "blueimp-file-upload": "^9.34.0", "bootstrap": "^3.4.1", "bootstrap-colorpicker": "^2.5.3", - "bootstrap-datepicker": "^1.9.0", + "bootstrap-datepicker": "^1.10.0", "bootstrap-less": "^3.3.8", "bootstrap-table": "1.21.4", "chart.js": "^2.9.4", diff --git a/public/css/dist/all.css b/public/css/dist/all.css index e6f7b8dd7cf2..a1d987634028 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -21546,9 +21546,9 @@ a.ui-button:active, } /*! - * Datepicker for Bootstrap v1.9.0 (https://github.com/uxsolutions/bootstrap-datepicker) + * Datepicker for Bootstrap v1.10.0 (https://github.com/uxsolutions/bootstrap-datepicker) * - * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) + * Licensed under the Apache License v2.0 (https://www.apache.org/licenses/LICENSE-2.0) */ .datepicker { diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js index 68a04d9a7ab8..9c591006f2e1 100644 --- a/public/js/build/vendor.js +++ b/public/js/build/vendor.js @@ -35001,9 +35001,9 @@ var effectsEffectTransfer = effect; })); /*! - * Datepicker for Bootstrap v1.9.0 (https://github.com/uxsolutions/bootstrap-datepicker) + * Datepicker for Bootstrap v1.10.0 (https://github.com/uxsolutions/bootstrap-datepicker) * - * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) + * Licensed under the Apache License v2.0 (https://www.apache.org/licenses/LICENSE-2.0) */ (function(factory){ @@ -35063,7 +35063,7 @@ var effectsEffectTransfer = effect; replace: function(new_array){ if (!new_array) return; - if (!$.isArray(new_array)) + if (!Array.isArray(new_array)) new_array = [new_array]; this.clear(); this.push.apply(this, new_array); @@ -35105,9 +35105,15 @@ var effectsEffectTransfer = effect; this.isInput = this.element.is('input'); this.inputField = this.isInput ? this.element : this.element.find('input'); this.component = this.element.hasClass('date') ? this.element.find('.add-on, .input-group-addon, .input-group-append, .input-group-prepend, .btn') : false; - if (this.component && this.component.length === 0) + if (this.component && this.component.length === 0){ this.component = false; - this.isInline = !this.component && this.element.is('div'); + } + + if (this.o.isInline === null){ + this.isInline = !this.component && !this.isInput; + } else { + this.isInline = this.o.isInline; + } this.picker = $(DPGlobal.template); @@ -35178,7 +35184,7 @@ var effectsEffectTransfer = effect; }, _resolveDaysOfWeek: function(daysOfWeek){ - if (!$.isArray(daysOfWeek)) + if (!Array.isArray(daysOfWeek)) daysOfWeek = daysOfWeek.split(/[,\s]*/); return $.map(daysOfWeek, Number); }, @@ -35265,7 +35271,7 @@ var effectsEffectTransfer = effect; o.daysOfWeekHighlighted = this._resolveDaysOfWeek(o.daysOfWeekHighlighted||[]); o.datesDisabled = o.datesDisabled||[]; - if (!$.isArray(o.datesDisabled)) { + if (!Array.isArray(o.datesDisabled)) { o.datesDisabled = o.datesDisabled.split(','); } o.datesDisabled = $.map(o.datesDisabled, function(d){ @@ -35572,16 +35578,15 @@ var effectsEffectTransfer = effect; clearDates: function(){ this.inputField.val(''); - this.update(); this._trigger('changeDate'); - + this.update(); if (this.o.autoclose) { this.hide(); } }, setDates: function(){ - var args = $.isArray(arguments[0]) ? arguments[0] : arguments; + var args = Array.isArray(arguments[0]) ? arguments[0] : arguments; this.update.apply(this, args); this._trigger('changeDate'); this.setValue(); @@ -35589,7 +35594,7 @@ var effectsEffectTransfer = effect; }, setUTCDates: function(){ - var args = $.isArray(arguments[0]) ? arguments[0] : arguments; + var args = Array.isArray(arguments[0]) ? arguments[0] : arguments; this.setDates.apply(this, $.map(args, this._utc_to_local)); return this; }, @@ -36041,7 +36046,7 @@ var effectsEffectTransfer = effect; //Check if uniqueSort exists (supported by jquery >=1.12 and >=2.2) //Fallback to unique function for older jquery versions - if ($.isFunction($.uniqueSort)) { + if (typeof $.uniqueSort === "function") { clsName = $.uniqueSort(clsName); } else { clsName = $.unique(clsName); @@ -36573,12 +36578,12 @@ var effectsEffectTransfer = effect; if (new_date < this.dates[j]){ // Date being moved earlier/left - while (j >= 0 && new_date < this.dates[j]){ + while (j >= 0 && new_date < this.dates[j] && (this.pickers[j].element.val() || "").length > 0) { this.pickers[j--].setUTCDate(new_date); } } else if (new_date > this.dates[k]){ // Date being moved later/right - while (k < l && new_date > this.dates[k]){ + while (k < l && new_date > this.dates[k] && (this.pickers[k].element.val() || "").length > 0) { this.pickers[k++].setUTCDate(new_date); } } @@ -36692,6 +36697,7 @@ var effectsEffectTransfer = effect; endDate: Infinity, forceParse: true, format: 'mm/dd/yyyy', + isInline: null, keepEmptyValues: false, keyboardNavigation: true, language: 'en', @@ -37009,7 +37015,7 @@ var effectsEffectTransfer = effect; /* DATEPICKER VERSION * =================== */ - $.fn.datepicker.version = '1.9.0'; + $.fn.datepicker.version = '1.10.0'; $.fn.datepicker.deprecated = function(msg){ var console = window.console; diff --git a/public/js/dist/all.js b/public/js/dist/all.js index b7c63e900681..4d5e9ac81805 100644 --- a/public/js/dist/all.js +++ b/public/js/dist/all.js @@ -35001,9 +35001,9 @@ var effectsEffectTransfer = effect; })); /*! - * Datepicker for Bootstrap v1.9.0 (https://github.com/uxsolutions/bootstrap-datepicker) + * Datepicker for Bootstrap v1.10.0 (https://github.com/uxsolutions/bootstrap-datepicker) * - * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0) + * Licensed under the Apache License v2.0 (https://www.apache.org/licenses/LICENSE-2.0) */ (function(factory){ @@ -35063,7 +35063,7 @@ var effectsEffectTransfer = effect; replace: function(new_array){ if (!new_array) return; - if (!$.isArray(new_array)) + if (!Array.isArray(new_array)) new_array = [new_array]; this.clear(); this.push.apply(this, new_array); @@ -35105,9 +35105,15 @@ var effectsEffectTransfer = effect; this.isInput = this.element.is('input'); this.inputField = this.isInput ? this.element : this.element.find('input'); this.component = this.element.hasClass('date') ? this.element.find('.add-on, .input-group-addon, .input-group-append, .input-group-prepend, .btn') : false; - if (this.component && this.component.length === 0) + if (this.component && this.component.length === 0){ this.component = false; - this.isInline = !this.component && this.element.is('div'); + } + + if (this.o.isInline === null){ + this.isInline = !this.component && !this.isInput; + } else { + this.isInline = this.o.isInline; + } this.picker = $(DPGlobal.template); @@ -35178,7 +35184,7 @@ var effectsEffectTransfer = effect; }, _resolveDaysOfWeek: function(daysOfWeek){ - if (!$.isArray(daysOfWeek)) + if (!Array.isArray(daysOfWeek)) daysOfWeek = daysOfWeek.split(/[,\s]*/); return $.map(daysOfWeek, Number); }, @@ -35265,7 +35271,7 @@ var effectsEffectTransfer = effect; o.daysOfWeekHighlighted = this._resolveDaysOfWeek(o.daysOfWeekHighlighted||[]); o.datesDisabled = o.datesDisabled||[]; - if (!$.isArray(o.datesDisabled)) { + if (!Array.isArray(o.datesDisabled)) { o.datesDisabled = o.datesDisabled.split(','); } o.datesDisabled = $.map(o.datesDisabled, function(d){ @@ -35572,16 +35578,15 @@ var effectsEffectTransfer = effect; clearDates: function(){ this.inputField.val(''); - this.update(); this._trigger('changeDate'); - + this.update(); if (this.o.autoclose) { this.hide(); } }, setDates: function(){ - var args = $.isArray(arguments[0]) ? arguments[0] : arguments; + var args = Array.isArray(arguments[0]) ? arguments[0] : arguments; this.update.apply(this, args); this._trigger('changeDate'); this.setValue(); @@ -35589,7 +35594,7 @@ var effectsEffectTransfer = effect; }, setUTCDates: function(){ - var args = $.isArray(arguments[0]) ? arguments[0] : arguments; + var args = Array.isArray(arguments[0]) ? arguments[0] : arguments; this.setDates.apply(this, $.map(args, this._utc_to_local)); return this; }, @@ -36041,7 +36046,7 @@ var effectsEffectTransfer = effect; //Check if uniqueSort exists (supported by jquery >=1.12 and >=2.2) //Fallback to unique function for older jquery versions - if ($.isFunction($.uniqueSort)) { + if (typeof $.uniqueSort === "function") { clsName = $.uniqueSort(clsName); } else { clsName = $.unique(clsName); @@ -36573,12 +36578,12 @@ var effectsEffectTransfer = effect; if (new_date < this.dates[j]){ // Date being moved earlier/left - while (j >= 0 && new_date < this.dates[j]){ + while (j >= 0 && new_date < this.dates[j] && (this.pickers[j].element.val() || "").length > 0) { this.pickers[j--].setUTCDate(new_date); } } else if (new_date > this.dates[k]){ // Date being moved later/right - while (k < l && new_date > this.dates[k]){ + while (k < l && new_date > this.dates[k] && (this.pickers[k].element.val() || "").length > 0) { this.pickers[k++].setUTCDate(new_date); } } @@ -36692,6 +36697,7 @@ var effectsEffectTransfer = effect; endDate: Infinity, forceParse: true, format: 'mm/dd/yyyy', + isInline: null, keepEmptyValues: false, keyboardNavigation: true, language: 'en', @@ -37009,7 +37015,7 @@ var effectsEffectTransfer = effect; /* DATEPICKER VERSION * =================== */ - $.fn.datepicker.version = '1.9.0'; + $.fn.datepicker.version = '1.10.0'; $.fn.datepicker.deprecated = function(msg){ var console = window.console; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 0c743f321903..444f5cecbfbc 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=f9cf53aca9755a528550786f25e3179c", + "/css/dist/all.css": "/css/dist/all.css?id=2ec375a06ce75587875e7b75ff0a694c", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=e2e2b1797606a266ed55549f5bb5a179", @@ -30,9 +30,9 @@ "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=6ebbf5afc34f54463abc2b81ca637364", "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=67b8a78b7e80e805cfa4ee0421895ba4", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=2265e072e44c782c901dce8e037d97fc", - "/js/build/vendor.js": "/js/build/vendor.js?id=3843eca1b2e670b29c1e1cb57e1d7aa7", + "/js/build/vendor.js": "/js/build/vendor.js?id=3592e07ae9a6d1805a4ea3bd3c034aef", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=a0e44dba789031b34ef150a01318b865", - "/js/dist/all.js": "/js/dist/all.js?id=17a3983c22be8965acf2124ea35c4a8d", + "/js/dist/all.js": "/js/dist/all.js?id=ba07d399f23b294f7c4983030b757423", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=e36e83c2aa3c3afdbb8ebe2c0309e91d", "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb",