@innovastudio/contentbuilder 1.3.39 → 1.3.40

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@innovastudio/contentbuilder",
-  "type":"module",
-  "version": "1.3.39",
+  "type": "module",
+  "version": "1.3.40",
   "description": "",
   "main": "public/contentbuilder/contentbuilder.esm.js",
   "files": [

package/public/contentbuilder/contentbuilder.esm.js

@@ -73948,7 +73948,7 @@ class MediaPicker {
                     <input id="inpMediaSource" class="input-src" type="text">
                     <button title="${util.out('Select')}" class="input-select" style="flex:none;"><svg class="is-icon-flex"><use xlink:href="#ion-more"></use></svg></button>
                     <div class="input-upload" style="position: relative; flex: 0 0 auto;box-shadow: rgba(0, 0, 0, 0.32) 0px 3px 6px -6px;">
-                        <form class="form-upload-larger" target="frameTarget${this.id}" method="post" action="${this.builder.opts.onLargerImageUpload}" enctype="multipart/form-data" style="position:absolute;display:flex;justify-content: center;align-items: center;top:0;left:0;width:100%;height:100%;">
+                        <form class="form-upload-larger" target="frameTarget${this.id}" method="post" action="${this.builder.opts.largerImageHandler}" enctype="multipart/form-data" style="position:absolute;display:flex;justify-content: center;align-items: center;top:0;left:0;width:100%;height:100%;">
                             <input name="hidRefId" class="input-ref-id" type="hidden" value="">
                             <svg class="is-icon-flex" style="width:18px;height:18px;"><use xlink:href="#ion-ios-cloud-upload-outline"></use></svg>
                             <input title="${util.out('Select')}" name="fileImage" class="input-file-select" type="file" accept="image/*,video/mp4" style="position:absolute;top:-30px;left:0;width:100%;height:80px;opacity: 0;cursor: pointer;">
@@ -73981,61 +73981,128 @@ class MediaPicker {
       const inpSrc = modalMediaSelect.querySelector('.input-src');
       const elm = modalMediaSelect.querySelector('.input-select');
       if (elm) dom.addEventListener(elm, 'click', () => {
-        if (this.builder.opts.onFileSelectClick) {
-          this.builder.opts.onFileSelectClick({
-            targetInput: inpSrc,
-            theTrigger: elm
+        let targetAssetType = this.builder.targetAssetType;
+        let targetInput = inpSrc;
+        let theTrigger = elm; //--- Same ass openAsset() in contentbuilder.js 2098
+
+        if (targetAssetType === 'media' && (this.builder.opts.onMediaSelectClick || this.builder.opts.onImageSelectClick)) {
+          if (this.builder.opts.onMediaSelectClick) {
+            this.builder.opts.onMediaSelectClick({
+              targetInput: targetInput,
+              theTrigger: theTrigger
+            });
+          } else {
+            this.builder.opts.onImageSelectClick({
+              targetInput: targetInput,
+              theTrigger: theTrigger
+            });
+          }
+        } else if (targetAssetType === 'video' && this.builder.opts.onVideoSelectClick) {
+          this.builder.opts.onVideoSelectClick({
+            targetInput: targetInput,
+            theTrigger: theTrigger
           });
-        } else if (this.builder.opts.onImageSelectClick) {
+        } else if (targetAssetType === 'image' && this.builder.opts.onImageSelectClick) {
           this.builder.opts.onImageSelectClick({
-            targetInput: inpSrc,
-            theTrigger: elm
+            targetInput: targetInput,
+            theTrigger: theTrigger
           });
-        } else if (this.builder.opts.fileselect) {
-          let modalFileSelect = builderStuff.querySelector('.is-modal.fileselect');
-          let iframe = modalFileSelect.querySelector('iframe');
-
-          if (this.builder.opts.assetRefresh) {
-            iframe.src = this.builder.opts.fileselect;
-            this.builder.opts.assetRefresh = false;
-          }
+        } else if (targetAssetType === 'audio' && this.builder.opts.onAudioSelectClick) {
+          this.builder.opts.onAudioSelectClick({
+            targetInput: targetInput,
+            theTrigger: theTrigger
+          });
+        } else if (targetAssetType === 'all' && this.builder.opts.onFileSelectClick) {
+          this.builder.opts.onFileSelectClick({
+            targetInput: targetInput,
+            theTrigger: theTrigger
+          });
+        } else {
+          let iframe;
+          let modal;
 
-          if (iframe.src === 'about:blank') {
-            iframe.src = this.builder.opts.fileselect;
-          }
+          if (targetAssetType === 'media') {
+            modal = this.builder.builderStuff.querySelector('.is-modal.mediaselect');
+            iframe = modal.querySelector('iframe');
 
-          util.showModal(modalFileSelect, false, () => {
+            if (iframe.src === 'about:blank') {
+              if (this.builder.opts.mediaSelect) iframe.src = this.builder.opts.mediaSelect;else if (this.builder.opts.imageSelect) iframe.src = this.builder.opts.imageSelect;
+            }
+          } else if (targetAssetType === 'video') {
+            modal = this.builder.builderStuff.querySelector('.is-modal.videoselect');
+            iframe = modal.querySelector('iframe');
+            if (iframe.src === 'about:blank') iframe.src = this.builder.opts.videoSelect;
+          } else if (targetAssetType === 'image') {
+            modal = this.builder.builderStuff.querySelector('.is-modal.imageselect');
+            iframe = modal.querySelector('iframe');
+            if (iframe.src === 'about:blank') iframe.src = this.builder.opts.imageSelect;
+          } else if (targetAssetType === 'audio') {
+            modal = this.builder.builderStuff.querySelector('.is-modal.audioselect');
+            iframe = modal.querySelector('iframe');
+            if (iframe.src === 'about:blank') iframe.src = this.builder.opts.audioSelect;
+          } else if (targetAssetType === 'all') {
+            modal = this.builder.builderStuff.querySelector('.is-modal.fileselect');
+            iframe = modal.querySelector('iframe');
+            if (iframe.src === 'about:blank') iframe.src = this.builder.opts.fileSelect;
+          } // this.builder.util.showModal(modal);
+
+
+          this.builder.util.showModal(modal, false, () => {
             elm.removeAttribute('data-focus');
             elm.focus();
           });
           elm.setAttribute('data-focus', true);
-          this.builder.targetInput = inpSrc;
-          this.builder.targetCallback = null; // this.builder.targetAssetType = 'media';
-        } else if (this.builder.opts.imageselect) {
-          let modalImageSelect = builderStuff.querySelector('.is-modal.imageselect');
-          let iframe = modalImageSelect.querySelector('iframe');
-
-          if (this.builder.opts.assetRefresh) {
-            iframe.src = this.builder.opts.imageselect;
-            this.builder.opts.assetRefresh = false;
-          }
+          this.builder.targetInput = inpSrc; // used by selectAsset() (see contentbuilder.js)
 
-          if (iframe.src === 'about:blank') {
-            iframe.src = this.builder.opts.imageselect;
-          }
+          this.builder.targetCallback = null; // this.targetAssetType = targetAssetType;
+        } //---
+        // if(this.builder.opts.onFileSelectClick) {
+        //     this.builder.opts.onFileSelectClick({targetInput: inpSrc, theTrigger: elm});
+        // } else if (this.builder.opts.onImageSelectClick) {
+        //     this.builder.opts.onImageSelectClick({targetInput: inpSrc, theTrigger: elm});
+        // } else if(this.builder.opts.fileselect) {
+        //     let modalFileSelect = builderStuff.querySelector('.is-modal.fileselect');
+        //     let iframe = modalFileSelect.querySelector('iframe');
+        //     if(this.builder.opts.assetRefresh) {
+        //         iframe.src = this.builder.opts.fileselect;
+        //         this.builder.opts.assetRefresh = false;
+        //     }
+        //     if(iframe.src === 'about:blank') {
+        //         iframe.src = this.builder.opts.fileselect;
+        //     }
+        //     util.showModal(modalFileSelect, false, ()=>{
+        //         elm.removeAttribute('data-focus');
+        //         elm.focus();
+        //     });
+        //     elm.setAttribute('data-focus', true);
+        //     this.builder.targetInput = inpSrc;
+        //     this.builder.targetCallback = null;
+        //     // this.builder.targetAssetType = 'media';
+        // } else if(this.builder.opts.imageselect) {
+        //     let modalImageSelect = builderStuff.querySelector('.is-modal.imageselect');
+        //     let iframe = modalImageSelect.querySelector('iframe');
+        //     if(this.builder.opts.assetRefresh) {
+        //         iframe.src = this.builder.opts.imageselect;
+        //         this.builder.opts.assetRefresh = false;
+        //     }
+        //     if(iframe.src === 'about:blank'){
+        //         iframe.src = this.builder.opts.imageselect;
+        //     }
+        //     util.showModal(modalImageSelect, false, ()=>{
+        //         elm.removeAttribute('data-focus');
+        //         elm.focus();
+        //     });
+        //     elm.setAttribute('data-focus', true);
+        //     this.builder.targetInput = inpSrc;
+        //     this.builder.targetCallback = null;
+        //     // this.builder.targetAssetType = 'media';
+        // }
 
-          util.showModal(modalImageSelect, false, () => {
-            elm.removeAttribute('data-focus');
-            elm.focus();
-          });
-          elm.setAttribute('data-focus', true);
-          this.builder.targetInput = inpSrc;
-          this.builder.targetCallback = null; // this.builder.targetAssetType = 'media';
-        }
       });
     }
 
     let inputFileSelect = modalMediaSelect.querySelector('.input-file-select');
+    let frm = modalMediaSelect.querySelector('.form-upload-larger');
     dom.addEventListener(inputFileSelect, 'change', e => {
       let element = inputFileSelect;
 
@@ -74046,12 +74113,42 @@ class MediaPicker {
       let frmUpload = element;
       dom.addClass(frmUpload, 'please-wait');
       modalMediaSelect.querySelector('.input-ref-id').value = this.builder.opts.customval;
+      let targetAssetType = this.builder.targetAssetType;
 
-      if (this.builder.opts.onLargerImageUpload) {
+      if (targetAssetType === 'media' && this.builder.opts.onMediaUpload) {
+        this.builder.opts.onMediaUpload(e);
+      } else if (targetAssetType === 'video' && this.builder.opts.onVideoUpload) {
+        this.builder.opts.onVideoUpload(e);
+      } else if (targetAssetType === 'image' && this.builder.opts.onLargerImageUpload) {
+        this.builder.opts.onLargerImageUpload(e);
+      } else if (targetAssetType === 'audio' && this.builder.opts.onAudioUpload) {
+        this.builder.opts.onAudioUpload(e);
+      } else if (targetAssetType === 'all' && this.builder.opts.onFileUpload) {
+        this.builder.opts.onFileUpload(e);
+      } else if (this.builder.opts.onLargerImageUpload) {
+        // backward
         this.builder.opts.onLargerImageUpload(e);
       } else {
+        if (targetAssetType === 'media') {
+          frm.setAttribute('action', this.builder.opts.mediaHandler);
+        } else if (targetAssetType === 'video') {
+          frm.setAttribute('action', this.builder.opts.videoHandler);
+        } else if (targetAssetType === 'image') {
+          frm.setAttribute('action', this.builder.opts.largerImageHandler);
+        } else if (targetAssetType === 'audio') {
+          frm.setAttribute('action', this.builder.opts.audioHandler);
+        } else if (targetAssetType === 'all') {
+          frm.setAttribute('action', this.builder.opts.fileHandler);
+          if (!this.builder.opts.fileHandler) frm.setAttribute('action', this.builder.opts.mediaHandler); //backward
+        }
+
         frmUpload.submit();
-      }
+      } // if(this.builder.opts.onLargerImageUpload) {
+      //     this.builder.opts.onLargerImageUpload(e);
+      // } else {
+      //     frmUpload.submit();
+      // }
+
 
       inputFileSelect.value = ''; // Clear Input
     });
@@ -74073,7 +74170,9 @@ class MediaPicker {
     const modalMediaSelect = this.modalMediaSelect;
     let inputFileSelect = modalMediaSelect.querySelector('.input-file-select');
 
-    if (assetType === 'media') {
+    if (assetType === 'all') {
+      inputFileSelect.setAttribute('accept', '*');
+    } else if (assetType === 'media') {
       inputFileSelect.setAttribute('accept', 'image/*,video/mp4');
     } else if (assetType === 'video') {
       inputFileSelect.setAttribute('accept', 'video/mp4');
@@ -75271,6 +75370,7 @@ class ContentBuilder {
         .is-col-tool svg {
             display: initial !important;
         }
+        
         `;
 
     if (!this.builderStuff.querySelector('style[data-rel="css-new"]')) {