vgapp 1.0.5 → 1.0.7

package/app/modules/vgfiles/js/vgfiles.js

@@ -52,10 +52,10 @@ class VGFiles extends VGFilesBase {
                 retryAttempts: 1,
                 retryDelay: 1000,
             },
-            removes: {
-                all: { route: '', alert: true, toast: true, confirm: null },
-                single: { route: '', alert: true, toast: true, confirm: null }
-            },
+            removes: {
+                all: { route: '', alert: true, toast: true, confirm: null },
+                single: { route: '', alert: true, toast: true, confirm: null }
+            },
             sortable: {
                 enabled: false,
                 route: '',
@@ -525,8 +525,8 @@ class VGFiles extends VGFilesBase {
         });
     }
 
-    reload(button) {
-        if (!this._params.ajax || !this._params.uploads.route) return;
+    reload(button) {
+        if (!this._params.ajax || !this._params.uploads.route) return;
 
         const dataButton = Manipulator.get(button, 'data');
         const fileData = {
@@ -556,88 +556,100 @@ class VGFiles extends VGFilesBase {
         this._triggerCallback('onReload', payload);
         this._triggerEvent('reload', payload);
 
-        this.upload(fileToRetry);
-    }
-
-    _runAjaxRequest(paramsAjax, callback) {
-        const previousAjax = this._params.ajax;
-        this._params.ajax = paramsAjax;
-
-        this._route((status, data) => {
-            this._params.ajax = previousAjax;
-            callback(status, data);
-        });
-    }
-
-    _normalizeConfirmResult(result) {
-        if (result === true) return { accepted: true, data: null };
-        if (result === false || result == null) return { accepted: false, data: null };
-
-        if (typeof result === 'object') {
-            if (typeof result.accepted === 'boolean') {
-                return { accepted: result.accepted, data: result.data ?? null };
-            }
-            if (Object.prototype.hasOwnProperty.call(result, 'data')) {
-                return { accepted: true, data: result.data ?? null };
-            }
-        }
-
-        return { accepted: Boolean(result), data: null };
-    }
-
-    _runDefaultRemoveConfirm(trigger, params) {
-        return new Promise((resolve) => {
-            VGAlert.confirm(trigger, {
-                lang: params.lang,
-                ajax: params.ajax,
-                buttons: params.buttons,
-                message: params.message
-            });
-
-            EventHandler.one(trigger, 'vg.alert.accept', (event) => {
-                resolve({ accepted: true, data: event?.vgalert?.data ?? null });
-            });
-
-            EventHandler.one(trigger, 'vg.alert.reject', () => {
-                resolve({ accepted: false, data: null });
-            });
-        });
-    }
-
-    _confirmRemove(type, trigger, ajax, message) {
-        const buttons = {
-            agree: {
-                text: lang_buttons(this._params.lang, NAME)['agree'],
-                class: ["btn-danger"],
-            },
-            cancel: {
-                text: lang_buttons(this._params.lang, NAME)['cancel'],
-                class: ["btn-outline-danger"],
-            },
-        };
-
-        const confirmParams = {
-            type,
-            trigger,
-            lang: this._params.lang,
-            ajax,
-            buttons,
-            message
-        };
-
-        const customConfirm = this._params?.removes?.[type]?.confirm;
-        if (typeof customConfirm === 'function') {
-            return Promise.resolve(customConfirm(confirmParams, this))
-                .then((result) => this._normalizeConfirmResult(result));
-        }
-
-        return this._runDefaultRemoveConfirm(trigger, confirmParams);
-    }
-
-    removeFile(button) {
+        this.upload(fileToRetry);
+    }
+
+    _runAjaxRequest(paramsAjax, callback) {
+        const previousAjax = this._params.ajax;
+        this._params.ajax = paramsAjax;
+
+        this._route((status, data) => {
+            this._params.ajax = previousAjax;
+            callback(status, data);
+        });
+    }
+
+    _normalizeConfirmResult(result) {
+        if (result === true) return { accepted: true, data: null };
+        if (result === false || result == null) return { accepted: false, data: null };
+
+        if (typeof result === 'object') {
+            if (typeof result.accepted === 'boolean') {
+                return { accepted: result.accepted, data: result.data ?? null };
+            }
+            if (Object.prototype.hasOwnProperty.call(result, 'data')) {
+                return { accepted: true, data: result.data ?? null };
+            }
+        }
+
+        return { accepted: Boolean(result), data: null };
+    }
+
+    _runDefaultRemoveConfirm(trigger, params) {
+        return new Promise((resolve) => {
+            VGAlert.confirm(trigger, {
+                lang: params.lang,
+                ajax: params.ajax,
+                buttons: params.buttons,
+                message: params.message
+            });
+
+            EventHandler.one(trigger, 'vg.alert.accept', (event) => {
+                resolve({ accepted: true, data: event?.vgalert?.data ?? null });
+            });
+
+            EventHandler.one(trigger, 'vg.alert.reject', () => {
+                resolve({ accepted: false, data: null });
+            });
+        });
+    }
+
+    _confirmRemove(type, trigger, ajax, message) {
+        const buttons = {
+            agree: {
+                text: lang_buttons(this._params.lang, NAME)['agree'],
+                class: ["btn-danger"],
+            },
+            cancel: {
+                text: lang_buttons(this._params.lang, NAME)['cancel'],
+                class: ["btn-outline-danger"],
+            },
+        };
+
+        const confirmParams = {
+            type,
+            trigger,
+            lang: this._params.lang,
+            ajax,
+            buttons,
+            message
+        };
+
+        const customConfirm = this._params?.removes?.[type]?.confirm;
+        if (typeof customConfirm === 'function') {
+            return Promise.resolve(customConfirm(confirmParams, this))
+                .then((result) => this._normalizeConfirmResult(result));
+        }
+
+        return this._runDefaultRemoveConfirm(trigger, confirmParams);
+    }
+
+    removeFile(button) {
         const name = normalizeData(Manipulator.get(button, 'data-name'));
         const size = normalizeData(Manipulator.get(button, 'data-size'));
         const id = normalizeData(Manipulator.get(button, 'data-id'));
+        const emitRemove = () => {
+            const payload = {
+                button: button,
+                name: name,
+                size: size,
+                id: id,
+                remaining: this._files.length
+            };
+
+            this._triggerCallback('onRemoveFile', payload);
+            this._triggerEvent('remove', payload);
+        };
 
         const fileToRemove = this._files.find(f => f.name === name && f.size === size);
         if (fileToRemove) {
@@ -668,9 +680,9 @@ class VGFiles extends VGFilesBase {
         if (this._params.ajax && this._params.removes.single.route) {
             if (!id) return;
 
-            const routeBase = this._params.removes.single.route;
-            const routeSeparator = routeBase.includes('?') ? '&' : '?';
-            const route = `${routeBase}${routeSeparator}id=${encodeURIComponent(id)}`;
+            const routeBase = this._params.removes.single.route;
+            const routeSeparator = routeBase.includes('?') ? '&' : '?';
+            const route = `${routeBase}${routeSeparator}id=${encodeURIComponent(id)}`;
             const paramsAjax = {
                 route: route,
                 method: 'delete'
@@ -689,51 +701,43 @@ class VGFiles extends VGFilesBase {
                 if (this._params.removes.single.toast) {
                     VGToast.run(data?.response?.message);
                 }
+
+                emitRemove();
             };
 
-            if (this._params.removes.single.alert) {
-                const message = {
-                    title: lang_messages(this._params.lang, NAME)['title'],
-                    description: lang_messages(this._params.lang, NAME)['description']
-                };
-
-                this._confirmRemove('single', button, paramsAjax, message)
-                    .then((result) => {
-                        if (!result.accepted) return;
-
-                        if (result.data) {
-                            _completeRemoveFile(result.data);
-                            return;
-                        }
-
-                        this._runAjaxRequest(paramsAjax, (status, data) => {
-                            _completeRemoveFile(data);
-                        });
-                    })
-                    .catch(() => {});
-            } else {
-                this._runAjaxRequest(paramsAjax, (status, data) => {
-                    _completeRemoveFile(data);
-                });
-            }
+            if (this._params.removes.single.alert) {
+                const message = {
+                    title: lang_messages(this._params.lang, NAME)['title'],
+                    description: lang_messages(this._params.lang, NAME)['description']
+                };
+
+                this._confirmRemove('single', button, paramsAjax, message)
+                    .then((result) => {
+                        if (!result.accepted) return;
+
+                        if (result.data) {
+                            _completeRemoveFile(result.data);
+                            return;
+                        }
+
+                        this._runAjaxRequest(paramsAjax, (status, data) => {
+                            _completeRemoveFile(data);
+                        });
+                    })
+                    .catch(() => {});
+            } else {
+                this._runAjaxRequest(paramsAjax, (status, data) => {
+                    _completeRemoveFile(data);
+                });
+            }
         } else {
             this._files = this._files.filter(f => !(f.name === name && f.size === size));
             this._updateStatsAfterRemove();
             this._files.length ? this.build() : this.clear(true);
+            emitRemove();
         }
 
         this._resetFileInput();
-
-        const payload = {
-            button: button,
-            name: name,
-            size: size,
-            id: id,
-            remaining: this._files.length
-        };
-
-        this._triggerCallback('onRemoveFile', payload);
-        this._triggerEvent('remove', payload);
     }
 
     _updateStatsAfterRemove() {
@@ -885,7 +889,14 @@ class VGFiles extends VGFilesBase {
         this._sortable = null;
 
         this.clear();
-        if (this._uploader) this._uploader.destroy();
+        if (this._uploader) {
+            if (typeof this._uploader.destroy === 'function') {
+                this._uploader.destroy();
+            } else {
+                if (typeof this._uploader.clear === 'function') this._uploader.clear();
+                if (typeof this._uploader.offAll === 'function') this._uploader.offAll();
+            }
+        }
         super.dispose();
     }
 }
@@ -932,37 +943,37 @@ EventHandler.on(document, `click.${NAME_KEY}.data.api`, SELECTOR_DATA_DISMISS_AL
             instance.clear(true, true);
         };
 
-        if (instance._params.removes.all.alert) {
-            const message = {
-                title: lang_messages(instance._params.lang, NAME)['title'],
-                description: lang_messages(instance._params.lang, NAME)['descriptions']
-            };
-
-            instance._confirmRemove('all', e.target, paramsAjax, message)
-                .then((result) => {
-                    if (!result.accepted) return;
-
-                    if (result.data) {
-                        if (instance._params.removes.all.toast) {
-                            VGToast.run(result.data?.response?.message);
-                        }
-                        _completeClearAll();
-                        return;
-                    }
-
-                    instance._runAjaxRequest(paramsAjax, (status, data) => {
-                        if (instance._params.removes.all.toast && data?.response?.message) {
-                            VGToast.run(data.response.message);
-                        }
-                        _completeClearAll();
-                    });
-                })
-                .catch(() => {});
-        } else {
-            instance._runAjaxRequest(paramsAjax, (status, data) => {
-                if (instance._params.removes.all.toast && data?.response?.message) {
-                    VGToast.run(data.response.message);
-                }
+        if (instance._params.removes.all.alert) {
+            const message = {
+                title: lang_messages(instance._params.lang, NAME)['title'],
+                description: lang_messages(instance._params.lang, NAME)['descriptions']
+            };
+
+            instance._confirmRemove('all', e.target, paramsAjax, message)
+                .then((result) => {
+                    if (!result.accepted) return;
+
+                    if (result.data) {
+                        if (instance._params.removes.all.toast) {
+                            VGToast.run(result.data?.response?.message);
+                        }
+                        _completeClearAll();
+                        return;
+                    }
+
+                    instance._runAjaxRequest(paramsAjax, (status, data) => {
+                        if (instance._params.removes.all.toast && data?.response?.message) {
+                            VGToast.run(data.response.message);
+                        }
+                        _completeClearAll();
+                    });
+                })
+                .catch(() => {});
+        } else {
+            instance._runAjaxRequest(paramsAjax, (status, data) => {
+                if (instance._params.removes.all.toast && data?.response?.message) {
+                    VGToast.run(data.response.message);
+                }
                 _completeClearAll();
             });
         }

package/app/modules/vgmodal/js/vgmodal.js

@@ -351,6 +351,7 @@ class VGModal extends BaseModule {
 			for (const elm of elements) {
 				switch (elm.tagName) {
 					case 'INPUT': elm.value = item.value; break;
+					case 'FORM': elm.action = item.value; break;
 					case 'IMG': Manipulator.set(elm, 'src', item.value); break;
 					default: elm.innerHTML = item.value;
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vgapp",
-	"version": "1.0.5",
+	"version": "1.0.7",
 	"description": "",
 	"author": {
 		"name": "Vegas Studio",