suneditor 2.45.0 → 2.46.0

package/src/lib/util.js

@@ -17,7 +17,8 @@ const util = {
     isIE_Edge: null,
     isOSX_IOS: null,
     isChromium: null,
-    isResizeObserverSupported: null, 
+    isMobile: null,
+    isResizeObserverSupported: null,
     _propertiesInit: function () {
         if (this._d) return;
         this._d =  document;
@@ -27,6 +28,7 @@ const util = {
         this.isOSX_IOS = /(Mac|iPhone|iPod|iPad)/.test(navigator.platform);
         this.isChromium = !!window.chrome;
         this.isResizeObserverSupported = (typeof ResizeObserver === 'function');
+        this.isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) || 'ontouchstart' in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
     },
 
     _allowedEmptyNodeList: '.se-component, pre, blockquote, hr, li, table, img, iframe, video, audio, canvas',
@@ -38,7 +40,7 @@ const util = {
      * @private
      */
     _HTMLConvertor: function (contents) {
-        const ec = {'&': '&amp;', '\u00A0': '&nbsp;', '\'': '&apos;', '"': '&quot;', '<': '&lt;', '>': '&gt;'};
+        const ec = {'&': '&amp;', '\u00A0': '&nbsp;', '\'': '&apos;', '"': '&quot;', '<': '&lt;', '>': '&gt;'};
         return contents.replace(/&|\u00A0|'|"|<|>/g, function (m) {
             return (typeof ec[m] === 'string') ? ec[m] : m;
         });
@@ -170,7 +172,7 @@ const util = {
      * @returns {String}
      */
     HTMLEncoder: function (contents) {
-        const ec = {'<': '$lt;', '>': '$gt;'};
+        const ec = {'<': '$lt;', '>': '$gt;'};
         return contents.replace(/<|>/g, function (m) {
             return (typeof ec[m] === 'string') ? ec[m] : m;
         });
@@ -184,7 +186,7 @@ const util = {
      * @returns {String}
      */
     HTMLDecoder: function (contents) {
-        const ec = {'$lt;': '<', '$gt;': '>'};
+        const ec = {'$lt;': '<', '$gt;': '>'};
         return contents.replace(/\$lt;|\$gt;/g, function (m) {
             return (typeof ec[m] === 'string') ? ec[m] : m;
         });
@@ -214,7 +216,7 @@ const util = {
         const pathList = [];
         const tagName = extension === 'js' ? 'script' : 'link';
         const src = extension === 'js' ? 'src' : 'href';
-        
+
         let fileName = '(?:';
         for (let i = 0, len = nameArray.length; i < len; i++) {
             fileName += nameArray[i] + (i < len - 1 ? '|' : ')');
@@ -222,7 +224,7 @@ const util = {
 
         const regExp = new this._w.RegExp('(^|.*[\\/])' + fileName + '(\\.[^\\/]+)?\.' + extension + '(?:\\?.*|;.*)?$', 'i');
         const extRegExp = new this._w.RegExp('.+\\.' + extension + '(?:\\?.*|;.*)?$', 'i');
-            
+
         for (let c = this._d.getElementsByTagName(tagName), i = 0; i < c.length; i++) {
             if (extRegExp.test(c[i][src])) {
                 pathList.push(c[i]);
@@ -255,14 +257,14 @@ const util = {
     getPageStyle: function (doc) {
         let cssText = '';
         const sheets = (doc || this._d).styleSheets;
-        
+
         for (let i = 0, len = sheets.length, rules; i < len; i++) {
             try {
                 rules = sheets[i].cssRules;
             } catch (e) {
                 continue;
             }
-            
+
             if (rules) {
                 for (let c = 0, cLen = rules.length; c < cLen; c++) {
                     cssText += rules[c].cssText;
@@ -488,7 +490,7 @@ const util = {
 
             element = element.parentNode;
         }
-        
+
         return null;
     },
 
@@ -531,7 +533,7 @@ const util = {
 
             element = element.parentNode;
         }
-        
+
         return null;
     },
 
@@ -553,7 +555,7 @@ const util = {
 
             element = element.parentNode;
         }
-        
+
         return null;
     },
 
@@ -603,7 +605,7 @@ const util = {
 
         validation = validation || function () { return true; };
         const arr = [];
-        
+
         for (let i = 0, len = array.length, a; i < len; i++) {
             a = array[i];
             if (validation(a)) {
@@ -733,7 +735,7 @@ const util = {
             }
             return false;
         }.bind(this));
-        
+
         return path.map(this.getPositionIndex).reverse();
     },
 
@@ -899,7 +901,7 @@ const util = {
      */
     getNumber: function (text, maxDec) {
         if (!text) return 0;
-        
+
         let number = (text + '').match(/-?\d+(\.\d+)?/);
         if (!number || !number[0]) return 0;
 
@@ -1054,6 +1056,54 @@ const util = {
         return element;
     },
 
+    /**
+     * @description Gets the previous sibling last child. If there is no sibling, then it'll take it from the closest ancestor with child
+     * Returns null if not found.
+     * @param {Node} node Reference element
+     * @param {Node|null} ceiling Highest boundary allowed
+     * @returns {Node|null}
+     */
+    getPreviousDeepestNode: function (node, ceiling) {
+        let previousNode = node.previousSibling;
+        if (!previousNode) {
+            for (let parentNode = node.parentNode; parentNode; parentNode = parentNode.parentNode) {
+                if (parentNode === ceiling) return null;
+                if (parentNode.previousSibling) {
+                    previousNode = parentNode.previousSibling;
+                    break;
+                }
+            }
+            if (!previousNode) return null;
+        }
+        while (previousNode.lastChild) previousNode = previousNode.lastChild;
+
+        return previousNode;
+    },
+
+    /**
+     * @description Gets the next sibling first child. If there is no sibling, then it'll take it from the closest ancestor with child
+     * Returns null if not found.
+     * @param {Node} node Reference element
+     * @param {Node|null} ceiling Highest boundary allowed
+     * @returns {Node|null}
+     */
+    getNextDeepestNode: function (node, ceiling) {
+        let nextNode = node.nextSibling;
+        if (!nextNode) {
+            for (let parentNode = node.parentNode; parentNode; parentNode = parentNode.parentNode) {
+                if (parentNode === ceiling) return null;
+                if (parentNode.nextSibling) {
+                    nextNode = parentNode.nextSibling;
+                    break;
+                }
+            }
+            if (!nextNode) return null;
+        }
+        while (nextNode.firstChild) nextNode = nextNode.firstChild;
+
+        return nextNode;
+    },
+
     /**
      * @description Get the child element of the argument value.
      * A tag that satisfies the query condition is imported.
@@ -1291,7 +1341,7 @@ const util = {
             let button = buttonList[i];
             if (important || !this.isImportantDisabled(button)) button.disabled = disabled;
             if (important) {
-                if (disabled) { 
+                if (disabled) {
                     button.setAttribute('data-important-disabled', '');
                 } else {
                     button.removeAttribute('data-important-disabled');
@@ -1368,7 +1418,7 @@ const util = {
         } else {
             rangeElement = baseNode;
         }
-        
+
         let rChildren;
         if (!all) {
             const depth = this.getElementDepth(baseNode) + 2;
@@ -1380,7 +1430,7 @@ const util = {
         for (let i = 0, len = rChildren.length; i < len; i++) {
             this._deleteNestedList(rChildren[i]);
         }
-        
+
         if (rNode) {
             rNode.parentNode.insertBefore(rangeElement, rNode.nextSibling);
             if (cNodes && cNodes.length === 0) this.removeItem(rNode);
@@ -1398,7 +1448,7 @@ const util = {
         let sibling = baseParent;
         let parent = sibling.parentNode;
         let liSibling, liParent, child, index, c;
-        
+
         while (this.isListCell(parent)) {
             index = this.getPositionIndex(baseNode);
             liSibling = parent.nextElementSibling;
@@ -1522,7 +1572,7 @@ const util = {
 
         this.mergeSameTags(newEl, null, false);
         this.mergeNestedTags(newEl, function (current) { return this.isList(current); }.bind(this));
-        
+
         if (newEl.childNodes.length > 0) pElement.insertBefore(newEl, depthEl);
         else newEl = depthEl;
 
@@ -1548,14 +1598,14 @@ const util = {
         const inst = this;
         const nodePathLen = nodePathArray ? nodePathArray.length : 0;
         let offsets = null;
-        
+
         if (nodePathLen) {
             offsets = this._w.Array.apply(null, new this._w.Array(nodePathLen)).map(this._w.Number.prototype.valueOf, 0);
         }
 
         (function recursionFunc(current, depth, depthIndex) {
             const children = current.childNodes;
-            
+
             for (let i = 0, len = children.length, child, next; i < len; i++) {
                 child = children[i];
                 next = children[i + 1];
@@ -1628,7 +1678,7 @@ const util = {
                                 path = nodePathArray[n];
                                 if (path && path[depth] > i) {
                                     if (depth > 0 && path[depth - 1] !== depthIndex) continue;
-    
+
                                     path[depth] -= 1;
                                     if (path[depth + 1] >= 0 && path[depth] === i) {
                                         path[depth + 1] += childLength;
@@ -1652,7 +1702,7 @@ const util = {
                                 path = nodePathArray[n];
                                 if (path && path[depth] > i) {
                                     if (depth > 0 && path[depth - 1] !== depthIndex) continue;
-    
+
                                     path[depth] -= 1;
                                     if (path[depth + 1] >= 0 && path[depth] === i) {
                                         path[depth + 1] += childLength;
@@ -1664,7 +1714,7 @@ const util = {
                     } else {
                         child.innerHTML += next.innerHTML;
                     }
-                    
+
                     inst.removeItem(next);
                     i--;
                 } else if (child.nodeType === 1) {
@@ -1687,7 +1737,7 @@ const util = {
         } else if (typeof validation !== 'function') {
             validation = function () { return true; };
         }
-        
+
         (function recursionFunc(current) {
             let children = current.children;
             if (children.length === 1 && children[0].nodeName === current.nodeName && validation(current)) {
@@ -1719,7 +1769,7 @@ const util = {
                 return element === current.parentElement;
             });
         }
-        
+
         (function recursionFunc(current) {
             if (inst._notTextNode(current) || current === notRemoveNode || inst.isNonEditable(current)) return 0;
             if (current !== element && inst.onlyZeroWidthSpace(current.textContent) && (!current.firstChild || !inst.isBreak(current.firstChild)) && !current.querySelector(inst._allowedEmptyNodeList)) {
@@ -1758,13 +1808,13 @@ const util = {
     },
 
     /**
-	 * @description HTML code compression
-	 * @param {string} html HTML string
-	 * @returns {string} HTML string
-	 */
-	htmlCompress: function (html) {
-		return html.replace(/\n/g, '').replace(/(>)(?:\s+)(<)/g, '$1$2');
-	},
+     * @description HTML code compression
+     * @param {string} html HTML string
+     * @returns {string} HTML string
+     */
+    htmlCompress: function (html) {
+        return html.replace(/\n/g, '').replace(/(>)(?:\s+)(<)/g, '$1$2');
+    },
 
     /**
      * @description Sort a element array by depth of element.
@@ -1782,6 +1832,23 @@ const util = {
             return a > b ? t : a < b ? f : 0;
         }.bind(this));
     },
+    
+    /**
+     * @description Escape a string for safe use in regular expressions.
+     * @param {String} string String to escape
+     * @returns {String}
+     */
+    escapeStringRegexp: function (string) {
+        if (typeof string !== 'string') {
+            throw new TypeError('Expected a string');
+        }
+
+        // Escape characters with special meaning either inside or outside character sets.
+        // Use a simple backslash escape when it’s always valid, and a `\xnn` escape when the simpler form would be disallowed by Unicode patterns’ stricter grammar.
+        return string
+            .replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
+            .replace(/-/g, '\\x2d');
+    },
 
     _isExcludeSelectionElement: function (element) {
         return !/FIGCAPTION/i.test(element.nodeName) && (this.isComponent(element) || /FIGURE/i.test(element.nodeName));
@@ -1916,8 +1983,8 @@ const util = {
             }
 
             const result = current.parentNode !== documentFragment && nrtag &&
-             ((this.isListCell(current) && !this.isList(current.parentNode)) ||
-              ((this.isFormatElement(current) || this.isComponent(current)) && !this.isRangeFormatElement(current.parentNode) && !this.getParentElement(current, this.isComponent)));
+                ((this.isListCell(current) && !this.isList(current.parentNode)) ||
+                    ((this.isFormatElement(current) || this.isComponent(current)) && !this.isRangeFormatElement(current.parentNode) && !this.getParentElement(current, this.isComponent)));
 
             return result;
         }.bind(this));
@@ -1925,7 +1992,7 @@ const util = {
         for (let i = 0, len = removeTags.length; i < len; i++) {
             this.removeItem(removeTags[i]);
         }
-        
+
         const checkTags = [];
         for (let i = 0, len = wrongTags.length, t, p; i < len; i++) {
             t = wrongTags[i];
@@ -2029,6 +2096,7 @@ const util = {
             this._setIframeCssTags(options);
         frame.contentDocument.body.className = options._editableClass;
         frame.contentDocument.body.setAttribute('contenteditable', true);
+        frame.contentDocument.body.setAttribute('autocorrect', "off");
     },
 
     _setIframeCssTags: function (options) {

package/src/plugins/dialog/audio.js

@@ -208,8 +208,10 @@ export default {
         element = element || this.context.audio._element;
         const container = this.util.getParentElement(element, this.util.isComponent) || element;
         const dataIndex = element.getAttribute('data-index') * 1;
+        
+        if (typeof this.functions.onAudioDeleteBefore === 'function' && (this.functions.onAudioDeleteBefore(element, container, dataIndex, this) === false)) return;
+        
         const focusEl = (container.previousElementSibling || container.nextElementSibling);
-
         const emptyDiv = container.parentNode;
         this.util.removeItem(container);
         this.plugins.audio.init.call(this);

package/src/plugins/dialog/image.js

@@ -243,7 +243,7 @@ export default {
 
     _setUrlInput: function (target) {
         this.altText.value = target.alt;
-        this._v_src._linkValue = this.previewSrc.textContent = this.imgUrlFile.value = target.src;
+        this._v_src._linkValue = this.previewSrc.textContent = this.imgUrlFile.value = target.getAttribute('data-value') || target.src;
         this.imgUrlFile.focus();
     },
 
@@ -273,6 +273,10 @@ export default {
         const imageEl = element || this.context.image._element;
         const imageContainer = this.util.getParentElement(imageEl, this.util.isMediaComponent) || imageEl;
         const dataIndex = imageEl.getAttribute('data-index') * 1;
+
+        // event
+        if (typeof this.functions.onImageDeleteBefore === 'function' && (this.functions.onImageDeleteBefore(imageEl, imageContainer, dataIndex, this) === false)) return;
+
         let focusEl = (imageContainer.previousElementSibling || imageContainer.nextElementSibling);
         
         const emptyDiv = imageContainer.parentNode;
@@ -516,6 +520,12 @@ export default {
 
     setup_reader: function (files, anchor, width, height, align, alt, filesLen, isUpdate) {
         try {
+            if (filesLen === 0) {
+                this.closeLoading();
+                console.warn('[SUNEDITOR.image.base64.fail] cause : No applicable files');
+                return;
+            }
+
             this.context.image.base64RenderIndex = filesLen;
             const wFileReader = this._w.FileReader;
             const filesStack = [filesLen];
@@ -793,6 +803,7 @@ export default {
                     formats.parentNode.insertBefore(container, existElement.previousSibling ? formats.nextElementSibling : formats);
                     if (contextImage.__updateTags.map(function (current) { return existElement.contains(current); }).length === 0) this.util.removeItem(existElement);
                 } else {
+                    existElement = this.util.isFigures(existElement.parentNode) ? existElement.parentNode : existElement;
                     existElement.parentNode.replaceChild(container, existElement);
                 }
             }

package/src/plugins/dialog/video.js

@@ -277,8 +277,10 @@ export default {
         const frame = element || this.context.video._element;
         const container = this.context.video._container;
         const dataIndex = frame.getAttribute('data-index') * 1;
-        let focusEl = (container.previousElementSibling || container.nextElementSibling);
 
+        if (typeof this.functions.onVideoDeleteBefore === 'function' && (this.functions.onVideoDeleteBefore(frame, container, dataIndex, this) === false)) return;
+
+        let focusEl = (container.previousElementSibling || container.nextElementSibling);
         const emptyDiv = container.parentNode;
         this.util.removeItem(container);
         this.plugins.video.init.call(this);
@@ -568,7 +570,7 @@ export default {
                     newTag.src = src;
                     oFrame.parentNode.replaceChild(newTag, oFrame);
                     contextVideo._element = oFrame = newTag;
-                } else if (!isYoutube && !isVimeo && !/^videoo$/i.test(oFrame.nodeName)) {
+                } else if (!isYoutube && !isVimeo && !/^video$/i.test(oFrame.nodeName)) {
                     const newTag = this.plugins.video.createVideoTag.call(this);
                     newTag.src = src;
                     oFrame.parentNode.replaceChild(newTag, oFrame);

package/src/plugins/modules/_anchor.js

@@ -303,7 +303,7 @@ export default {
         const protocol = this.options.linkProtocol;
         const noPrefix = this.options.linkNoPrefix;
         const reservedProtocol  = /^(mailto\:|tel\:|sms\:|https*\:\/\/|#)/.test(value) || value.indexOf(protocol) === 0;
-        const sameProtocol = !protocol ? false : this._w.RegExp('^' + value.substr(0, protocol.length)).test(protocol);
+        const sameProtocol = !protocol ? false : this._w.RegExp('^' + this.util.escapeStringRegexp(value.substr(0, protocol.length))).test(protocol);
         value = context.linkValue = preview.textContent = !value ? '' : noPrefix ? value : (protocol && !reservedProtocol && !sameProtocol) ? protocol + value : reservedProtocol ? value : /^www\./.test(value) ? 'http://' + value : this.context.anchor.host + (/^\//.test(value) ? '' : '/') + value;
 
         if (this.plugins.anchor.selfPathBookmark.call(this, value)) {