suneditor 2.43.2 → 2.43.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suneditor",
-  "version": "2.43.2",
+  "version": "2.43.5",
   "description": "Pure JavaScript based WYSIWYG web editor",
   "author": "JiHong.Lee",
   "license": "MIT",

package/src/lib/constructor.js

@@ -398,6 +398,9 @@ export default {
     _initOptions: function (element, options) {
         /** Values */
         options.lang = options.lang || _defaultLang;
+        options.value = typeof options.value === 'string' ? options.value : null;
+        options.historyStackDelayTime = typeof options.historyStackDelayTime === 'number' ? options.historyStackDelayTime : 400;
+        // tag style
         options.defaultTag = typeof options.defaultTag === 'string' && options.defaultTag.length > 0 ? options.defaultTag : 'p';
         const textTags = options.textTags = [{bold: 'STRONG', underline: 'U', italic: 'EM', strike: 'DEL', sub: 'SUB', sup: 'SUP'}, (options.textTags || {})].reduce(function (_default, _new) {
             for (let key in _new) {
@@ -418,8 +421,14 @@ export default {
             'sub': textTags.sub.toLowerCase(),
             'sup': textTags.sup.toLowerCase()
         };
-        options.value = typeof options.value === 'string' ? options.value : null;
-        options.historyStackDelayTime = typeof options.historyStackDelayTime === 'number' ? options.historyStackDelayTime : 400;
+        options._defaultCommand = {
+            bold: options.textTags.bold,
+            underline: options.textTags.underline,
+            italic: options.textTags.italic,
+            strike: options.textTags.strike,
+            subscript: options.textTags.sub,
+            superscript: options.textTags.sup
+        };
         /** Whitelist, Blacklist */
         const whitelist = 'br|p|div|pre|blockquote|h1|h2|h3|h4|h5|h6|ol|ul|li|hr|figure|figcaption|img|iframe|audio|video|source|table|thead|tbody|tr|th|td|a|b|strong|var|i|em|u|ins|s|span|strike|del|sub|sup|code|svg|path|details|summary';
         // tags
@@ -574,9 +583,6 @@ export default {
             ['fullScreen', 'showBlocks', 'codeView'],
             ['preview', 'print']
         ];
-        /** Private options */
-        options.__listCommonStyle = options.__listCommonStyle || ['fontSize', 'color', 'fontFamily'];
-        // options.__defaultFontSize;
 
         /** RTL - buttons */
         if (options.rtl) {
@@ -599,6 +605,10 @@ export default {
             return _default;
         }, {});
 
+        /** Private options */
+        // options.__defaultFontSize;
+        options.__listCommonStyle = options.__listCommonStyle || ['fontSize', 'color', 'fontFamily', 'fontWeight', 'fontStyle'];
+
         /** _init options */
         options._editorStyles = util._setDefaultOptionStyle(options, options.defaultStyle);
     },

package/src/lib/core.d.ts

@@ -199,16 +199,6 @@ interface Core {
      */
     allCommandButtons: Record<string, Element>;
 
-    /**
-     * @description Save the current buttons states to "allCommandButtons" object
-     */
-    saveButtonStates(): void;
-
-    /**
-     * @description Recover the current buttons states from "allCommandButtons" object
-     */
-    recoverButtonStates(): void;
-
     /**
      * @description If the plugin is not added, add the plugin and call the 'add' function.
      * If the plugin is added call callBack function.

package/src/lib/core.js

@@ -475,19 +475,6 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
          */
         _styleCommandMap: null,
 
-        /**
-         * @description Map of default command
-         * @private
-         */
-        _defaultCommand: {
-            bold: options.textTags.bold,
-            underline: options.textTags.underline,
-            italic: options.textTags.italic,
-            strike: options.textTags.strike,
-            subscript: options.textTags.sub,
-            superscript: options.textTags.sup
-        },
-
         /**
          * @description Variables used internally in editor operation
          * @property {Boolean} isCodeView State of code view
@@ -523,40 +510,6 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             _lineBreakDir: ''
         },
 
-        /**
-         * @description Save the current buttons states to "allCommandButtons" object
-         */
-        saveButtonStates: function () {
-            if (!this.allCommandButtons) this.allCommandButtons = {};
-
-            const currentButtons = this.context.element._buttonTray.querySelectorAll('.se-menu-list button[data-display]');
-            for (let i = 0, element, command; i < currentButtons.length; i++) {
-                element = currentButtons[i];
-                command = element.getAttribute('data-command');
-
-                this.allCommandButtons[command] = element;
-            }
-        },
-
-        /**
-         * @description Recover the current buttons states from "allCommandButtons" object
-         */
-        recoverButtonStates: function () {
-            if (this.allCommandButtons) {
-                const currentButtons = this.context.element._buttonTray.querySelectorAll('.se-menu-list button[data-display]'); 
-                for (let i = 0, button, command, oldButton; i < currentButtons.length; i++) {
-                    button = currentButtons[i]; 
-                    command = button.getAttribute('data-command');
-
-                    oldButton = this.allCommandButtons[command];
-                    if (oldButton) {
-                        button.parentElement.replaceChild(oldButton, button);
-                        if (this.context.tool[command]) this.context.tool[command] = oldButton;
-                    }
-                }   
-            }
-        },
-
         /**
          * @description If the plugin is not added, add the plugin and call the 'add' function.
          * If the plugin is added call callBack function.
@@ -1692,7 +1645,9 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 return null;
             }
 
-            const freeFormat = util.getFreeFormatElement(this.getSelectionNode(), null);
+            const line = util.getFormatElement(this.getSelectionNode(), null);
+            const listCell = util.isListCell(line);
+            const freeFormat = util.isFreeFormatElement(line);
             const isFormats = (!freeFormat && (util.isFormatElement(oNode) || util.isRangeFormatElement(oNode))) || util.isComponent(oNode);
 
             if (!afterNode && (isFormats || util.isComponent(oNode) || util.isMedia(oNode))) {
@@ -1837,7 +1792,18 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                     oNode = fNode;
                 }
 
-                parentNode.insertBefore(oNode, parentNode === afterNode ? parentNode.lastChild : afterNode);
+                // insert--
+                let emptyListCell = false;
+                if (listCell && util.isListCell(oNode)) {
+                    afterNode = line.nextElementSibling;
+                    parentNode = line.parentNode;
+                    emptyListCell = util.onlyZeroWidthSpace(line.textContent);
+                } else {
+                    afterNode = parentNode === afterNode ? parentNode.lastChild : afterNode;
+                }
+
+                parentNode.insertBefore(oNode, afterNode);
+                if (emptyListCell) util.removeItem(line);
             } catch (e) {
                 parentNode.appendChild(oNode);
             } finally {
@@ -2810,20 +2776,26 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
 
             // one line
             if (oneLine) {
-                this._resetCommonListCell(lineNodes[0], styleArray);
+                if (this._resetCommonListCell(lineNodes[0], styleArray)) range = this.setRange(startCon, startOff, endCon, endOff);
+
                 const newRange = this._nodeChange_oneLine(lineNodes[0], newNode, validation, startCon, startOff, endCon, endOff, isRemoveFormat, isRemoveNode, range.collapsed, _removeCheck, _getMaintainedNode, _isMaintainedNode);
                 start.container = newRange.startContainer;
                 start.offset = newRange.startOffset;
                 end.container = newRange.endContainer;
                 end.offset = newRange.endOffset;
+                
                 if (start.container === end.container && util.onlyZeroWidthSpace(start.container)) {
                     start.offset = end.offset = 1;
                 }
                 this._setCommonListStyle(newRange.ancestor, null);
             } else { // multi line 
+                let appliedCommonList = false;
+                if (endLength > 0 && this._resetCommonListCell(lineNodes[endLength], styleArray)) appliedCommonList = true;
+                if (this._resetCommonListCell(lineNodes[0], styleArray)) appliedCommonList = true;
+                if (appliedCommonList) this.setRange(startCon, startOff, endCon, endOff);
+
                 // end
                 if (endLength > 0) {
-                    this._resetCommonListCell(lineNodes[endLength], styleArray);
                     newNode = appendNode.cloneNode(false);
                     end = this._nodeChange_endLine(lineNodes[endLength], newNode, validation, endCon, endOff, isRemoveFormat, isRemoveNode, _removeCheck, _getMaintainedNode, _isMaintainedNode);
                 }
@@ -2841,7 +2813,6 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 }
 
                 // start
-                this._resetCommonListCell(lineNodes[0], styleArray);
                 newNode = appendNode.cloneNode(false);
                 start = this._nodeChange_startLine(lineNodes[0], newNode, validation, startCon, startOff, isRemoveFormat, isRemoveNode, _removeCheck, _getMaintainedNode, _isMaintainedNode, end.container);
 
@@ -2901,9 +2872,11 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             }
 
             let sel = refer.cloneNode(false);
-            let r = null;
+            let r = null, appliedEl = false;
             for (let i = 0, len = children.length, c, s; i < len; i++) {
                 c = children[i];
+                if (options._textTagsMap[c.nodeName.toLowerCase()]) continue;
+
                 s = util.getValues(c.style);
                 if (s.length === 0 || (ec.some(function (k) {return s.indexOf(k) === -1;}) && s.some(function(k) {ec.indexOf(k) > -1;}))) {
                     r = c.nextSibling;
@@ -2912,11 +2885,19 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                     el.insertBefore(sel, r);
                     sel = refer.cloneNode(false);
                     r = null;
+                    appliedEl = true;
                 }
             }
             
-            if (sel.childNodes.length > 0) el.insertBefore(sel, r);
-            if (!elStyles.length) el.removeAttribute('style');
+            if (sel.childNodes.length > 0) {
+                el.insertBefore(sel, r);
+                appliedEl = true;
+            }
+            if (!elStyles.length) {
+                el.removeAttribute('style');
+            }
+
+            return appliedEl;
         },
 
         /**
@@ -2934,40 +2915,39 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             if (!child || children.length > 1 || child.nodeType !== 1) return;
             
             // set cell style---
-            const commonStyleElements = [];
             const childStyle = child.style;
             const elStyle = el.style;
+            const nodeName = child.nodeName.toLowerCase();
+            let appliedEl = false;
 
             // bold, italic
-            if (options._textTagsMap[child.nodeName.toLowerCase()] === this._defaultCommand.bold.toLowerCase()) elStyle.fontWeight = 'bold'; // bold
-            else if (childStyle.fontWeight) elStyle.fontWeight = childStyle.fontWeight;
-            if (options._textTagsMap[child.nodeName.toLowerCase()] === this._defaultCommand.italic.toLowerCase()) elStyle.fontStyle = 'italic'; // italic
-            else if (childStyle.fontStyle) elStyle.fontStyle = childStyle.fontStyle;
+            if (options._textTagsMap[nodeName] === options._defaultCommand.bold.toLowerCase()) elStyle.fontWeight = 'bold';
+            if (options._textTagsMap[nodeName] === options._defaultCommand.italic.toLowerCase()) elStyle.fontStyle = 'italic';
 
             // styles
             const cKeys = util.getValues(childStyle);
-            for (let i = 0, len = this._listCamel.length; i < len; i++) {
-                if (cKeys.indexOf(this._listKebab[i]) > -1) {
-                    elStyle[this._listCamel[i]] = childStyle[this._listCamel[i]];
-                    childStyle.removeProperty(this._listKebab[i]);
+            if (cKeys.length > 0) {
+                for (let i = 0, len = this._listCamel.length; i < len; i++) {
+                    if (cKeys.indexOf(this._listKebab[i]) > -1) {
+                        elStyle[this._listCamel[i]] = childStyle[this._listCamel[i]];
+                        childStyle.removeProperty(this._listKebab[i]);
+                        appliedEl = true;
+                    }
                 }
             }
-            
-            // remove child
-            if (!childStyle.length) commonStyleElements.push(child);
 
             this._setCommonListStyle(el, child);
+            if (!appliedEl) return;
 
             // common style
-            for (let i = 0, len = commonStyleElements.length, n, ch, p; i < len; i++) {
-                n = commonStyleElements[i];
-                ch = n.childNodes;
-                p = n.parentNode;
-                n = n.nextSibling;
+            if (!childStyle.length) {
+                const ch = child.childNodes;
+                const p = child.parentNode;
+                const n = child.nextSibling;
                 while (ch.length > 0) {
                     p.insertBefore(ch[0], n);
                 }
-                util.removeItem(commonStyleElements[i]);
+                util.removeItem(child);
             }
         },
 
@@ -4284,7 +4264,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                         wysiwyg.appendChild(format);
                         last = br;
                     }
-                    this.setRange(first, 0, last, last.textContent.length);
+                    event._showToolbarBalloon(this.setRange(first, 0, last, last.textContent.length));
                     break;
                 case 'codeView':
                     this.toggleCodeView();
@@ -4337,7 +4317,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                     if (context.tool.save) context.tool.save.setAttribute('disabled', true);
                     break;
                 default : // 'STRONG', 'U', 'EM', 'DEL', 'SUB', 'SUP'..
-                    command = this._defaultCommand[command.toLowerCase()] || command;
+                    command = options._defaultCommand[command.toLowerCase()] || command;
                     if (!this.commandMap[command]) this.commandMap[command] = target;
 
                     const nodesMap = this._variable.currentNodesMap;
@@ -5152,7 +5132,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             for (let i = 0, t; i < domTree.length; i++) {
                 t = domTree[i];
 
-                if (!util.isFormatElement(t) && !util.isComponent(t) && !util.isMedia(t)) {
+                if (!util.isFormatElement(t) && !util.isRangeFormatElement(t) && !util.isComponent(t) && !util.isMedia(t)) {
                     if (!p) p = util.createElement(options.defaultTag);
                     p.appendChild(t);
                     i--;
@@ -5626,12 +5606,8 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             this.codeViewDisabledButtons = context.element._buttonTray.querySelectorAll('.se-menu-list button[data-display]:not([class~="se-code-view-enabled"]):not([data-display="MORE"])');
             this.resizingDisabledButtons = context.element._buttonTray.querySelectorAll('.se-menu-list button[data-display]:not([class~="se-resizing-enabled"]):not([data-display="MORE"])');
 
-            this.saveButtonStates();
-
             const tool = context.tool;
             this.commandMap = {
-                SUB: tool.subscript,
-                SUP: tool.superscript,
                 OUTDENT: tool.outdent,
                 INDENT: tool.indent
             };
@@ -5639,6 +5615,8 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             this.commandMap[options.textTags.underline.toUpperCase()] = tool.underline;
             this.commandMap[options.textTags.italic.toUpperCase()] = tool.italic;
             this.commandMap[options.textTags.strike.toUpperCase()] = tool.strike;
+            this.commandMap[options.textTags.sub.toUpperCase()] = tool.subscript;
+            this.commandMap[options.textTags.sup.toUpperCase()] = tool.superscript;
             
             this._styleCommandMap = {
                 fullScreen: tool.fullScreen,
@@ -5978,7 +5956,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
 
             const marginDir = options.rtl ? 'marginRight' : 'marginLeft';
             const commandMap = core.commandMap;
-            const classOnCheck = this._onButtonsCheck;
+            const classOnCheck = event._onButtonsCheck;
             const commandMapNodes = [];
             const currentNodes = [];
 
@@ -7233,6 +7211,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
         onBlur_wysiwyg: function (e) {
             if (core._antiBlur || core._variable.isCodeView) return;
             core.hasFocus = false;
+            core.effectNode = null;
             core.controllersOff();
             if (core._isInline || core._isBalloon) event._hideToolbar();
 
@@ -7605,7 +7584,9 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             for (let i = 0, len = domTree.length, node; i < len; i++) {
                 node = domTree[i];
                 if (node.nodeType === 1) {
-                    if (util.isFormatElement(node)) {
+                    if (util.isListCell(node)) {
+                        html += node.outerHTML;
+                    } else if (util.isFormatElement(node)) {
                         html += '<li>' +(node.innerHTML.trim() || '<br>') + '</li>';
                     } else if (util.isRangeFormatElement(node) && !util.isTable(node)) {
                         html += event._convertListCell(node);
@@ -8117,11 +8098,10 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             context.tool = newContext.tool;
             if (options.iframe) context.element.wysiwyg = core._wd.body;
 
-            core.recoverButtonStates();
-
             core._cachingButtons();
             core.history._resetCachingButton();
 
+            core.effectNode = null;
             if (core.hasFocus) event._applyTagEffects();
             if (core.isReadOnly) util.setDisabledButtons(true, core.resizingDisabledButtons);
             if (typeof functions.onSetToolbarButtons === 'function') functions.onSetToolbarButtons(newToolbar._buttonTray.querySelectorAll('button'), core);
@@ -8668,4 +8648,4 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
     }
 
     return functions;
-}
+}

package/src/plugins/dialog/math.js

@@ -23,8 +23,7 @@ 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('keyup', this._renderMathExp.bind(core, context.math), false);
-        context.math.focusElement.addEventListener('change', this._renderMathExp.bind(core, context.math), 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);
 
         /** math controller */
@@ -140,7 +139,7 @@ export default {
 
     _renderer: function (exp) {
         const katex = this.options.katex;
-        return katex.src.renderToString(exp, katex.options);
+        return katex.src.renderToString(exp, {throwOnError: true, displayMode: true});
     },
 
     _renderMathExp: function (contextMath, e) {

package/src/plugins/dialog/video.js

@@ -817,7 +817,7 @@ export default {
 
         if (!onlyH) w = this.util.getNumber(w, 0);
         if (!onlyW) h = this.util.isNumber(h) ? h + contextVideo.sizeUnit : !h ? '' : h;
-        w ? w + contextVideo.sizeUnit : '';
+        w = w ? w + contextVideo.sizeUnit : '';
 
         if (!onlyH) contextVideo._element.style.width = w;
         if (!onlyW) contextVideo._cover.style.paddingBottom = contextVideo._cover.style.height = h;