This commit is contained in:
2026-01-22 03:34:49 +02:00
parent e6504e8801
commit 5245598fd6
5 changed files with 21 additions and 22 deletions
+1 -1
View File
@@ -529,7 +529,7 @@ export class App extends Boot {
/** /**
* Left Logo - Ev Handler * Left Logo - Ev Handler
*/ */
$('.left-logo').dxOn('click', (_, t) => { $('.left-logo')?.dxOn('click', (_, t) => {
if (App.section != App.config.home) { if (App.section != App.config.home) {
App.initModule(App.config.home, {}, { eTarget: t }); App.initModule(App.config.home, {}, { eTarget: t });
} }
+1 -1
View File
@@ -44,7 +44,7 @@ export class Boot {
} }
Boot.preInit(); Boot.preInit();
Rt.setCsrfToken(document.documentElement.dxFind('meta[name="csrf-token"]')?.content); Rt.setCsrfToken(document.documentElement.dxFind('meta[name="csrf-token"]')?.content);
Boot.intData = mod.intData; Boot.intData = mod.intData;
+2 -1
View File
@@ -8,6 +8,7 @@ import { DatePicker } from '../widgets/date-picker/DatePicker';
import { TwoDatePicker } from '../widgets/two-datepicker/TwoDatepicker'; import { TwoDatePicker } from '../widgets/two-datepicker/TwoDatepicker';
import { IntervalPicker } from '../widgets/interval-picker/IntervalPicker'; import { IntervalPicker } from '../widgets/interval-picker/IntervalPicker';
import { Uploader } from '../widgets/uploader/Uploader'; import { Uploader } from '../widgets/uploader/Uploader';
import { PinBox } from '../widgets/pin-box/PinBox';
export class Render { export class Render {
@@ -979,7 +980,7 @@ export class Render {
Render.makeFieldWrapper(field, parent).append(input); Render.makeFieldWrapper(field, parent).append(input);
input.PinBox({ digits: field.digits || 6 }); new PinBox(input, { digits: field.digits || 6 });
return input; return input;
} }
+2 -1
View File
@@ -3,6 +3,7 @@ import './popover.css';
import { Ut } from '../../utils/Ut'; import { Ut } from '../../utils/Ut';
import { El, $ } from "../../utils/dom"; import { El, $ } from "../../utils/dom";
import { Overlay } from '../overlay'; import { Overlay } from '../overlay';
import { Boot } from '../../core/Boot';
export class Popover { export class Popover {
@@ -30,7 +31,7 @@ export class Popover {
if (!this.opts.multiple) { if (!this.opts.multiple) {
// Destroy old instances // Destroy old instances
Boot.widgetStack?.Popover.forEach(popover => popover.destroy()); Boot.widgetStack?.Popover?.forEach(popover => popover.destroy());
} }
this.create(); this.create();
+15 -18
View File
@@ -68,13 +68,7 @@ export class Uploader {
*/ */
setRouter() { setRouter() {
let router = Boot.intData?.config?.media; this.router = pubData?.media?.[this.target.name];
if (!router) {
return false;
}
this.router = router[ this.target.name ];
if (!this.router) { if (!this.router) {
return false; return false;
@@ -91,7 +85,7 @@ export class Uploader {
} }
if (this.router.img) { if (this.router.img) {
ext.push('jpg', 'jpeg', 'png', 'webp'); ext.push('jpg', 'jpeg', 'png', 'webp', 'svg');
} }
this.router.ext = [ ... new Set(ext) ].join('|'); this.router.ext = [ ... new Set(ext) ].join('|');
@@ -462,7 +456,10 @@ export class Uploader {
thumb.dataset.id = src; thumb.dataset.id = src;
thumb.href = that.dir + '/' + src.replace('0_', '1_') + '?' + _now; const ext = that.getFileExt(src);
thumb.href = that.dir + '/' + (ext != 'svg' ? src.replace('0_', '1_') : src) + '?' + _now;
} }
else { // Multiple Files > Another File Extension else { // Multiple Files > Another File Extension
@@ -495,12 +492,14 @@ export class Uploader {
// Single File // Single File
let ext = that.getFileExt(files[0]); const ext = that.getFileExt(files[0]);
let _now = Date.now(); const _now = Date.now();
let filename = files[0]; let filename = files[0];
if (that.isImageFile(files[0])) { // Single File > Image Extension if (that.isImageFile(files[0])) { // Single File > Image Extension
if (!thumbs.length) { if (!thumbs.length) {
let thumb = El('a', { className: 'loading' }, let thumb = El('a', { className: 'loading' },
@@ -509,7 +508,7 @@ export class Uploader {
); );
thumb.dataset.id = filename; thumb.dataset.id = filename;
thumb.href = this.dir + '/' + filename.replace('0_', '1_') + '?' + _now; thumb.href = this.dir + '/' + (ext != 'svg' ? filename.replace('0_', '1_') : filename) + '?' + _now;
this.ui.prepend(thumb); this.ui.prepend(thumb);
} }
@@ -522,10 +521,9 @@ export class Uploader {
img.classList.remove('icon'); img.classList.remove('icon');
thumb.dataset.id = filename; thumb.dataset.id = filename;
thumb.href = this.dir + '/' + (ext != 'svg' ? filename.replace('0_', '1_') : filename) + '?' + _now;
thumb.removeAttribute('target');
thumb.href = this.dir + '/' + filename.replace('0_', '1_') + '?' + _now; thumb.removeAttribute('target');
} }
} }
else { // Single File > Another File Extension else { // Single File > Another File Extension
@@ -608,8 +606,7 @@ export class Uploader {
* Uploader , Check for imgs ext * Uploader , Check for imgs ext
*/ */
isImageFile(filename) { isImageFile(filename) {
let ext = this.getFileExt(filename); return ['jpg', 'jpeg', 'png', 'webp', 'svg'].includes( this.getFileExt(filename) );
return (ext == 'jpg' || ext == 'jpeg' || ext == 'png' || ext == 'webp')
} }
/** /**
@@ -662,7 +659,7 @@ export class Uploader {
*/ */
getFileExt(file) { getFileExt(file) {
let token = file.split('?')[0].split('.', 2); let token = file.split('?')[0].split('.', 2);
return token.length == 2 ? token[1] : ''; return token.length === 2 ? token[1] : '';
} }
/** /**