diff --git a/www/core/netitor b/www/core/netitor index 80122d0..936f6a4 160000 --- a/www/core/netitor +++ b/www/core/netitor @@ -1 +1 @@ -Subproject commit 80122d06a535284c8199fcdd0fb1f5b59b3a9d79 +Subproject commit 936f6a47f1395aed4809d759faad446e80529647 diff --git a/www/custom-elements/misc/file-drop/index.js b/www/custom-elements/misc/file-drop/index.js index 7afad84..cf81d16 100644 --- a/www/custom-elements/misc/file-drop/index.js +++ b/www/custom-elements/misc/file-drop/index.js @@ -1,14 +1,15 @@ /* global HTMLElement CustomEvent FileList */ class FileDrop extends HTMLElement { - static get observedAttributes () { return ['accept', 'max-size', 'max-files', 'multiple'] } + static get observedAttributes () { return ['accept', 'max-size', 'max-files', 'multiple', 'disableFileList'] } constructor (opts) { super() this.config = { accept: '.pdf, .jpg, .png', maxSize: '5MB', - maxFiles: '1', - multiple: false + maxFiles: 1, + multiple: false, + disableFileList: false } this.files = [] } @@ -47,9 +48,9 @@ class FileDrop extends HTMLElement { applyAttributes () { this.config.accept = this.getAttribute('accept') ?? this.config.accept this.config.maxSize = this.getAttribute('max-size') ?? this.config.maxSize - const mf = parseInt(this.getAttribute('max-files'), 10) - this.config.maxFiles = Number.isFinite(mf) ? mf : this.config.maxFiles - this.config.multiple = this.hasAttribute('multiple') || this.config.maxFiles > 1 + this.config.maxFiles = this.getAttribute('maxFiles') || this.config.maxFiles + this.config.multiple = this.getAttribute('multiple') || this.config.maxFiles > 1 + this.config.disableFileList = this.hasAttribute('disableFileList') || this.config.disableFileList } applyListeners () { @@ -84,7 +85,7 @@ class FileDrop extends HTMLElement { }) // return if maxFiles amount is already met - if (this.files.length >= maxFiles) { + if (this.files.length > maxFiles) { this.displayMsg({ text: `Max amount of files (${maxFiles}) has already been uploaded. Please remove previously uploaded files and re-upload.`, type: 'error' @@ -102,7 +103,7 @@ class FileDrop extends HTMLElement { const { add, rejected } = this.filterMaxFilesAmount(acceptedFiles) this.files.push(...add) - this.renderFileItems() + if (!this.config.disableFileList) this.renderFileItems() this.dispatchEvent(new CustomEvent('files-changed', { detail: { added: add, rejected, files: this.files.slice() }, @@ -124,7 +125,7 @@ class FileDrop extends HTMLElement { filterMaxFilesAmount (files) { const maxFiles = this.config.maxFiles - const max = Number.isFinite(maxFiles) ? maxFiles : 1 + const max = maxFiles ?? 1 const room = Math.max(0, max - this.files.length) const add = files.slice(0, room) const rejected = files.slice(room) diff --git a/www/widgets/demo-maker/popups/index.html b/www/widgets/demo-maker/popups/index.html index dd115f5..62db2ae 100644 --- a/www/widgets/demo-maker/popups/index.html +++ b/www/widgets/demo-maker/popups/index.html @@ -33,7 +33,7 @@

Demo Maker