@innovastudio/contentbuilder 1.4.40 → 1.4.42

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@innovastudio/contentbuilder",
   "type": "module",
-  "version": "1.4.40",
+  "version": "1.4.42",
   "description": "",
   "main": "public/contentbuilder/contentbuilder.esm.js",
   "files": [
@@ -52,8 +52,6 @@
     "@monaco-editor/loader": "^1.3.2",
     "blueimp-load-image": "^5.16.0",
     "cropperjs": "^1.5.12",
-    "csp-html-webpack-plugin": "^5.1.0",
-    "html-webpack-plugin": "^5.5.0",
     "js-beautify": "^1.14.0",
     "moveable": "^0.30.0",
     "rangy": "^1.3.0",

package/public/contentbuilder/contentbuilder.esm.js

@@ -53320,6 +53320,78 @@ class Hyperlink {
         util.hideModal(modal);
         if (!util.appleMobile) util.restoreSelection();
       });
+
+      if (this.builder.opts.onOtherSelectClick || this.builder.opts.otherSelect !== '') {
+        modal.querySelector('.input-select-other').style.display = 'block';
+        let inputSelectOther = modal.querySelector('.input-select-other');
+        dom.addEventListener(inputSelectOther, 'click', e => {
+          if (this.builder.opts.onOtherSelectClick) {
+            this.builder.opts.onOtherSelectClick({
+              targetInput: modal.querySelector('.input-url'),
+              theTrigger: modal.querySelector('.input-select-other')
+            });
+          } else {
+            let modalFileSelect = this.builderStuff.querySelector('.is-modal.otherselect');
+
+            if (this.builder.opts.assetRefresh) {
+              modalFileSelect.querySelector('iframe').src = this.builder.opts.otherSelect;
+              this.builder.opts.assetRefresh = false;
+            }
+
+            if (modalFileSelect.querySelector('iframe').src === 'about:blank') {
+              modalFileSelect.querySelector('iframe').src = this.builder.opts.otherSelect;
+            }
+
+            util.showModal(modalFileSelect, false, () => {
+              inputSelectOther.removeAttribute('data-focus');
+              inputSelectOther.focus();
+            }, false);
+            inputSelectOther.setAttribute('data-focus', true);
+          }
+
+          this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
+
+          this.builder.targetCallback = null;
+          this.builder.targetAssetType = 'all';
+          e.preventDefault();
+          e.stopImmediatePropagation();
+        });
+      }
+
+      if (this.builder.opts.onFileSelectClick || this.builder.opts.fileselect !== '') {
+        modal.querySelector('.input-select').style.display = 'block';
+        modal.querySelector('.input-url').style.width = '444px';
+        let inputSelect = modal.querySelector('.input-select');
+        dom.addEventListener(inputSelect, 'click', () => {
+          if (this.builder.opts.onFileSelectClick) {
+            this.builder.opts.onFileSelectClick({
+              targetInput: modal.querySelector('.input-url'),
+              theTrigger: modal.querySelector('.input-select')
+            });
+          } else {
+            let modalFileSelect = this.builderStuff.querySelector('.is-modal.fileselect');
+
+            if (this.builder.opts.assetRefresh) {
+              modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
+              this.builder.opts.assetRefresh = false;
+            }
+
+            if (modalFileSelect.querySelector('iframe').src === 'about:blank') {
+              modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
+            }
+
+            util.showModal(modalFileSelect, false, null, false);
+          }
+
+          this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
+
+          this.builder.targetCallback = null;
+          this.builder.targetAssetType = 'all';
+        });
+      } else {
+        modal.querySelector('.input-select').style.display = 'none';
+        modal.querySelector('.input-url').style.width = '100%';
+      }
     }
 
     this.linkTool = linkTool;
@@ -53519,83 +53591,70 @@ class Hyperlink {
 
     var text = dom.getSelected();
     let modal = this.builderStuff.querySelector('.is-modal.createlink');
-
-    if (this.builder.opts.onOtherSelectClick || this.builder.opts.otherSelect !== '') {
-      modal.querySelector('.input-select-other').style.display = 'block';
-      let inputSelectOther = modal.querySelector('.input-select-other');
-      dom.addEventListener(inputSelectOther, 'click', e => {
-        if (this.builder.opts.onOtherSelectClick) {
-          this.builder.opts.onOtherSelectClick({
-            targetInput: modal.querySelector('.input-url'),
-            theTrigger: modal.querySelector('.input-select-other')
-          });
-        } else {
-          let modalFileSelect = this.builderStuff.querySelector('.is-modal.otherselect');
-
-          if (this.builder.opts.assetRefresh) {
-            modalFileSelect.querySelector('iframe').src = this.builder.opts.otherSelect;
-            this.builder.opts.assetRefresh = false;
-          }
-
-          if (modalFileSelect.querySelector('iframe').src === 'about:blank') {
-            modalFileSelect.querySelector('iframe').src = this.builder.opts.otherSelect;
-          }
-
-          util.showModal(modalFileSelect, false, () => {
-            inputSelectOther.removeAttribute('data-focus');
-            inputSelectOther.focus();
-          }, false);
-          inputSelectOther.setAttribute('data-focus', true);
-        }
-
-        this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
-
-        this.builder.targetCallback = null;
-        this.builder.targetAssetType = 'all';
-        e.preventDefault();
-        e.stopImmediatePropagation();
-      });
-    }
-
-    if (this.builder.opts.onFileSelectClick || this.builder.opts.fileselect !== '') {
-      modal.querySelector('.input-select').style.display = 'block'; // modal.querySelector('.input-url').style.width = '444px';
-
-      let inputSelect = modal.querySelector('.input-select');
-      dom.addEventListener(inputSelect, 'click', e => {
-        if (this.builder.opts.onFileSelectClick) {
-          this.builder.opts.onFileSelectClick({
-            targetInput: modal.querySelector('.input-url'),
-            theTrigger: modal.querySelector('.input-select')
-          });
-        } else {
-          let modalFileSelect = this.builderStuff.querySelector('.is-modal.fileselect');
-
-          if (this.builder.opts.assetRefresh) {
-            modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
-            this.builder.opts.assetRefresh = false;
-          }
-
-          if (modalFileSelect.querySelector('iframe').src === 'about:blank') {
-            modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
-          }
-
-          util.showModal(modalFileSelect, false, () => {
-            inputSelect.removeAttribute('data-focus');
-            inputSelect.focus();
-          }, false);
-          inputSelect.setAttribute('data-focus', true);
-        }
-
-        this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
-
-        this.builder.targetCallback = null;
-        this.builder.targetAssetType = 'all';
-        e.preventDefault();
-        e.stopImmediatePropagation();
-      });
-    } else {
-      modal.querySelector('.input-select').style.display = 'none'; // modal.querySelector('.input-url').style.width = '100%';
+    /*
+    if(this.builder.opts.onOtherSelectClick || this.builder.opts.otherSelect !== ''){
+         modal.querySelector('.input-select-other').style.display = 'block';
+         let inputSelectOther = modal.querySelector('.input-select-other');
+        dom.addEventListener(inputSelectOther, 'click', (e) => {
+             if(this.builder.opts.onOtherSelectClick){
+                this.builder.opts.onOtherSelectClick({targetInput: modal.querySelector('.input-url'), theTrigger: modal.querySelector('.input-select-other')});
+            } else {
+                let modalFileSelect = this.builderStuff.querySelector('.is-modal.otherselect');
+                 if(this.builder.opts.assetRefresh) {
+                    modalFileSelect.querySelector('iframe').src = this.builder.opts.otherSelect;
+                    this.builder.opts.assetRefresh = false;
+                }
+                if(modalFileSelect.querySelector('iframe').src === 'about:blank') {
+                    modalFileSelect.querySelector('iframe').src = this.builder.opts.otherSelect;
+                }
+                util.showModal(modalFileSelect, false, ()=>{
+                     inputSelectOther.removeAttribute('data-focus');
+                    inputSelectOther.focus();
+                    
+                }, false);
+                 inputSelectOther.setAttribute('data-focus',true);
+            }
+             this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
+            this.builder.targetCallback = null;
+            this.builder.targetAssetType = 'all';
+             e.preventDefault();
+            e.stopImmediatePropagation();
+         });
     }
+      if(this.builder.opts.onFileSelectClick || this.builder.opts.fileselect !== ''){
+         modal.querySelector('.input-select').style.display = 'block';
+        // modal.querySelector('.input-url').style.width = '444px';
+         let inputSelect = modal.querySelector('.input-select');
+        dom.addEventListener(inputSelect, 'click', (e) => {
+             if(this.builder.opts.onFileSelectClick){
+                this.builder.opts.onFileSelectClick({targetInput: modal.querySelector('.input-url'), theTrigger: modal.querySelector('.input-select')});
+            } else {
+                let modalFileSelect = this.builderStuff.querySelector('.is-modal.fileselect');
+                 if(this.builder.opts.assetRefresh) {
+                    modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
+                    this.builder.opts.assetRefresh = false;
+                }
+                if(modalFileSelect.querySelector('iframe').src === 'about:blank') {
+                    modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
+                }
+                util.showModal(modalFileSelect, false, ()=>{
+                     inputSelect.removeAttribute('data-focus');
+                    inputSelect.focus();
+                    
+                }, false);
+                 inputSelect.setAttribute('data-focus',true);
+            }
+             this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
+            this.builder.targetCallback = null;
+            this.builder.targetAssetType = 'all';
+             e.preventDefault();
+            e.stopImmediatePropagation();
+         });
+     } else {
+         modal.querySelector('.input-select').style.display = 'none';
+        // modal.querySelector('.input-url').style.width = '100%';
+     }
+    */
 
     modal.querySelector('.input-url').value = '';
     modal.querySelector('.input-newwindow').checked = false;
@@ -53659,41 +53718,67 @@ class Hyperlink {
         modal.querySelector('#inpCreateLinkText').style.display = 'none';
       }
     }
-
-    if (this.builder.opts.onFileSelectClick || this.builder.opts.fileselect !== '') {
-      modal.querySelector('.input-select').style.display = 'block';
-      modal.querySelector('.input-url').style.width = '444px';
-      let inputSelect = modal.querySelector('.input-select');
-      dom.addEventListener(inputSelect, 'click', () => {
-        if (this.builder.opts.onFileSelectClick) {
-          this.builder.opts.onFileSelectClick({
-            targetInput: modal.querySelector('.input-url'),
-            theTrigger: modal.querySelector('.input-select')
-          });
-        } else {
-          let modalFileSelect = this.builderStuff.querySelector('.is-modal.fileselect');
-
-          if (this.builder.opts.assetRefresh) {
-            modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
-            this.builder.opts.assetRefresh = false;
-          }
-
-          if (modalFileSelect.querySelector('iframe').src === 'about:blank') {
-            modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
-          }
-
-          util.showModal(modalFileSelect, false, null, false);
-        }
-
-        this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
-
-        this.builder.targetCallback = null;
-        this.builder.targetAssetType = 'all';
-      });
-    } else {
-      modal.querySelector('.input-select').style.display = 'none';
-      modal.querySelector('.input-url').style.width = '100%';
-    } // Get values
+    /*
+    if(this.builder.opts.onOtherSelectClick || this.builder.opts.otherSelect !== ''){
+         modal.querySelector('.input-select-other').style.display = 'block';
+         let inputSelectOther = modal.querySelector('.input-select-other');
+        dom.addEventListener(inputSelectOther, 'click', (e) => {
+             if(this.builder.opts.onOtherSelectClick){
+                this.builder.opts.onOtherSelectClick({targetInput: modal.querySelector('.input-url'), theTrigger: modal.querySelector('.input-select-other')});
+            } else {
+                let modalFileSelect = this.builderStuff.querySelector('.is-modal.otherselect');
+                 if(this.builder.opts.assetRefresh) {
+                    modalFileSelect.querySelector('iframe').src = this.builder.opts.otherSelect;
+                    this.builder.opts.assetRefresh = false;
+                }
+                if(modalFileSelect.querySelector('iframe').src === 'about:blank') {
+                    modalFileSelect.querySelector('iframe').src = this.builder.opts.otherSelect;
+                }
+                util.showModal(modalFileSelect, false, ()=>{
+                     inputSelectOther.removeAttribute('data-focus');
+                    inputSelectOther.focus();
+                    
+                }, false);
+                 inputSelectOther.setAttribute('data-focus',true);
+            }
+             this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
+            this.builder.targetCallback = null;
+            this.builder.targetAssetType = 'all';
+             e.preventDefault();
+            e.stopImmediatePropagation();
+         });
+    }
+    
+    if(this.builder.opts.onFileSelectClick || this.builder.opts.fileselect !== ''){
+         modal.querySelector('.input-select').style.display = 'block';
+        modal.querySelector('.input-url').style.width = '444px';
+         let inputSelect = modal.querySelector('.input-select');
+        dom.addEventListener(inputSelect, 'click', () => {
+             if(this.builder.opts.onFileSelectClick) {
+                this.builder.opts.onFileSelectClick({targetInput: modal.querySelector('.input-url'), theTrigger: modal.querySelector('.input-select')});
+            
+            } else {
+                let modalFileSelect = this.builderStuff.querySelector('.is-modal.fileselect');
+                
+                if(this.builder.opts.assetRefresh) {
+                    modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
+                    this.builder.opts.assetRefresh = false;
+                }
+                if(modalFileSelect.querySelector('iframe').src === 'about:blank') {
+                    modalFileSelect.querySelector('iframe').src = this.builder.opts.fileselect;
+                }
+                util.showModal(modalFileSelect, false, null, false);
+             }
+             this.builder.targetInput = modal.querySelector('.input-url'); // used by selectAsset() (see contentbuilder.js)
+            this.builder.targetCallback = null;
+            this.builder.targetAssetType = 'all';
+         });
+     } else {
+         modal.querySelector('.input-select').style.display = 'none';
+        modal.querySelector('.input-url').style.width = '100%';
+     }
+    */
+    // Get values
 
 
     let url = link.getAttribute('href');