suneditor 2.46.2 → 2.47.0

package/src/lib/core.js

@@ -1756,6 +1756,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 return null;
             }
 
+            let fNode = null;
             let range = this.getRange();
             let line = util.isListCell(range.commonAncestorContainer) ? range.commonAncestorContainer : util.getFormatElement(this.getSelectionNode(), null);
             let insertListCell = util.isListCell(line) && (util.isListCell(oNode) || util.isList(oNode));
@@ -1958,9 +1959,10 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                     }
 
                     if (util.isWysiwygDiv(parentNode) && (oNode.nodeType === 3 || util.isBreak(oNode))) {
-                        const fNode = util.createElement(options.defaultTag);
-                        fNode.appendChild(oNode);
-                        oNode = fNode;
+                        const fomatNode = util.createElement(options.defaultTag);
+                        fomatNode.appendChild(oNode);
+                        fNode = oNode;
+                        oNode = fomatNode;
                     }
                 }
 
@@ -2018,6 +2020,8 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 parentNode.appendChild(oNode);
                 console.warn('[SUNEDITOR.insertNode.warn] ' + error);
             } finally {
+                if (fNode) oNode = fNode;
+
                 const dupleNodes = parentNode.querySelectorAll('[data-se-duple]');
                 if (dupleNodes.length > 0) {
                     for (let i = 0, len = dupleNodes.length, d, c, ch, parent; i < len; i++) {
@@ -2049,30 +2053,8 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 if (!util.isComponent(oNode)) {
                     let offset = 1;
                     if (oNode.nodeType === 3) {
-                        const previous = oNode.previousSibling;
-                        const next = oNode.nextSibling;
-                        const previousText = (!previous ||  previous.nodeType === 1 || util.onlyZeroWidthSpace(previous)) ? '' : previous.textContent;
-                        const nextText = (!next || next.nodeType === 1 || util.onlyZeroWidthSpace(next)) ? '' : next.textContent;
-
-                        if (previous && previousText.length > 0) {
-                            oNode.textContent = previousText + oNode.textContent;
-                            util.removeItem(previous);
-                        }
-
-                        if (next && next.length > 0) {
-                            oNode.textContent += nextText;
-                            util.removeItem(next);
-                        }
-
-                        const newRange = {
-                            container: oNode,
-                            startOffset: previousText.length,
-                            endOffset: oNode.textContent.length - nextText.length
-                        };
-
-                        this.setRange(oNode, newRange.startOffset, oNode, newRange.endOffset);
-
-                        return newRange;
+                        offset = oNode.textContent.length;
+                        this.setRange(oNode, offset, oNode, offset);
                     } else if (!util.isBreak(oNode) && !util.isListCell(oNode) && util.isFormatElement(parentNode)) {
                         let zeroWidth = null;
                         if (!oNode.previousSibling || util.isBreak(oNode.previousSibling)) {
@@ -2094,9 +2076,6 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                     this.setRange(oNode, offset, oNode, offset);
                 }
 
-                // history stack
-                this.history.push(true);
-
                 return oNode;
             }
         },
@@ -5320,7 +5299,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                         r = style[i].match(/([a-zA-Z0-9-]+)(:)([^"']+)/);
                         if (r && !/inherit|initial|revert|unset/i.test(r[3])) {
                             const k = util.kebabToCamelCase(r[1].trim());
-                            const v = this.wwComputedStyle[k].replace(/"/g, '');
+                            const v = this.wwComputedStyle[k] ? this.wwComputedStyle[k].replace(/"/g, '') : '';
                             const c = r[3].trim();
                             switch (k) {
                                 case 'fontFamily':
@@ -5943,7 +5922,9 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             // set whitelist
             const getRegList = function (str, str2) { return !str ? '^' : (str === '*' ? '[a-z-]+' : (!str2 ? str : (str + '|' + str2))); };
             // tags
-            const defaultAttr = 'contenteditable|colspan|rowspan|target|href|download|rel|src|alt|class|type|controls|origin-size';
+            const videoAttr = '|controls|autoplay|loop|muted|poster|preload|playsinline';
+            const iframeAttr = '|allowfullscreen|sandbox|loading|allow|referrerpolicy|frameborder|scrolling';
+            const defaultAttr = 'contenteditable|colspan|rowspan|target|href|download|rel|src|alt|class|type|origin-size' + videoAttr + iframeAttr;
             const dataAttr = 'data-format|data-size|data-file-size|data-file-name|data-origin|data-align|data-image-link|data-rotate|data-proportion|data-percentage|data-exp|data-font-size';
             this._allowHTMLComments = options._editorTagsWhitelist.indexOf('//') > -1 || options._editorTagsWhitelist === '*';
             // html check
@@ -6256,12 +6237,14 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 this._editorRange();
             }
 
-            if (util.isBreak(format.nextSibling)) util.removeItem(format.nextSibling);
-            if (util.isBreak(format.previousSibling)) util.removeItem(format.previousSibling);
-            if (util.isBreak(focusNode)) {
-                const zeroWidth = util.createTextNode(util.zeroWidthSpace);
-                focusNode.parentNode.insertBefore(zeroWidth, focusNode);
-                focusNode = zeroWidth;
+            if (format) {
+                if (util.isBreak(format.nextSibling)) util.removeItem(format.nextSibling);
+                if (util.isBreak(format.previousSibling)) util.removeItem(format.previousSibling);
+                if (util.isBreak(focusNode)) {
+                    const zeroWidth = util.createTextNode(util.zeroWidthSpace);
+                    focusNode.parentNode.insertBefore(zeroWidth, focusNode);
+                    focusNode = zeroWidth;
+                }
             }
 
             this.effectNode = null;
@@ -6443,6 +6426,10 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
         },
 
         _applyTagEffects: function () {
+            if (util.hasClass(context.element.wysiwyg, 'se-read-only')) {
+                return false;
+            }
+
             let selectionNode = core.getSelectionNode();
             if (selectionNode === core.effectNode) return;
             core.effectNode = selectionNode;
@@ -6624,6 +6611,11 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
         },
 
         onClick_wysiwyg: function (e) {
+            // if (util.hasClass(context.element.wysiwyg, 'se-read-only')) {
+            //     e.preventDefault();
+            //     return false;
+            // }
+
             const targetElement = e.target;
 
             if (core.isReadOnly) {

package/src/plugins/dialog/math.js

@@ -25,6 +25,11 @@ export default {
         context.math.focusElement = math_dialog.querySelector('.se-math-exp');
         context.math.previewElement = math_dialog.querySelector('.se-math-preview');
         context.math.fontSizeElement = math_dialog.querySelector('.se-math-size');
+        context.math.focusElement.addEventListener('paste', function (e) {
+            if (typeof core.functions.onPasteMath === 'function') {
+                core.functions.onPasteMath(e, core);
+            }
+        }, false);
         context.math.focusElement.addEventListener(core.util.isIE ? 'textinput' : 'input', this._renderMathExp.bind(core, context.math), false);
         context.math.fontSizeElement.addEventListener('change', function (e) { this.fontSize = e.target.value; }.bind(context.math.previewElement.style), false);
 

package/src/plugins/dialog/video.js

@@ -29,6 +29,7 @@ export default {
             _align: 'none',
             _floatClassRegExp: '__se__float\\-[a-z]+',
             _youtubeQuery: options.youtubeQuery,
+            _vimeoQuery: options.vimeoQuery,
             _videoRatio: (options.videoRatio * 100) + '%',
             _defaultRatio: (options.videoRatio * 100) + '%',
             _linkValue: '',
@@ -540,6 +541,15 @@ export default {
                     url = url.slice(0, -1);
                 }
                 url = 'https://player.vimeo.com/video/' + url.slice(url.lastIndexOf('/') + 1);
+
+                if (contextVideo._vimeoQuery.length > 0) {
+                    if (/\?/.test(url)) {
+                        const splitUrl = url.split('?');
+                        url = splitUrl[0] + '?' + contextVideo._vimeoQuery + '&' + splitUrl[1];
+                    } else {
+                        url += '?' + contextVideo._vimeoQuery;
+                    }
+                }
             }
 
             this.plugins.video.create_video.call(this, this.plugins.video[(!/embed|iframe|player|\/e\/|\.php|\.html?/.test(url) && !/vimeo\.com/.test(url) ? "createVideoTag" : "createIframeTag")].call(this), url, contextVideo.inputX.value, contextVideo.inputY.value, contextVideo._align, null, this.context.dialog.updateModal);