suneditor 2.47.4 → 2.47.6

package/src/lib/core.js

@@ -1214,6 +1214,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 if (util.isWysiwygDiv(range.commonAncestorContainer)) selectionNode = range.commonAncestorContainer.children[range.startOffset] || range.commonAncestorContainer;
                 else selectionNode = range.commonAncestorContainer;
             } else {
+                // extentNode - Firefox legacy
                 selectionNode = selection.extentNode || selection.anchorNode;
             }
 
@@ -5275,7 +5276,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 case '%':
                     return (pxSize * 0.0625).toFixed(2) + to;
                 case 'pt':
-                    return math.floor(pxSize / 1.333) + to;
+                    return math.round(pxSize / 1.333) + to;
                 default: // px
                     return pxSize + to;
             }
@@ -5415,6 +5416,9 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                     value += '<!-- ' + n.textContent + ' -->';
                 } else if (!util.isFormatElement(n) && !util.isRangeFormatElement(n) && !util.isComponent(n) && !/meta/i.test(n.nodeName)) {
                     if (!f) f = util.createElement(options.defaultTag);
+                    if (util.isTextStyleElement(n)) {
+                        (n).removeAttribute('style');
+                    }
                     f.appendChild(n);
                     i--; len--;
                 } else {
@@ -5950,7 +5954,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                     if (k === 'all') {
                         allAttr = getRegList(_wAttr[k], defaultAttr);
                     } else {
-                        tagsAttr[k] = new wRegExp('\\s(?:' + getRegList(_wAttr[k], '') + ')' + regEndStr, 'ig');
+                        tagsAttr[k] = new wRegExp('\\s(?:' + getRegList(_wAttr[k], defaultAttr) + ')' + regEndStr, 'ig');
                     }
                 }
             }
@@ -6355,6 +6359,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
         _responsiveCurrentSize: 'default',
         _responsiveButtonSize: null,
         _responsiveButtons: null,
+        _deleteKeyCode: new _w.RegExp('^(8|46)$'),
         _cursorMoveKeyCode: new _w.RegExp('^(8|3[2-9]|40|46)$'),
         _directionKeyCode: new _w.RegExp('^(8|13|3[2-9]|40|46)$'),
         _nonTextKeyCode: new _w.RegExp('^(8|13|1[6-9]|20|27|3[3-9]|40|45|46|11[2-9]|12[0-3]|144|145)$'),
@@ -7307,7 +7312,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                         if (range.startContainer !== range.endContainer) core.removeNode();
 
                         let next = util.getArrayItem(formatEl.children, util.isList, false);
-                        next = next || formatEl.nextElementSibling || rangeEl.parentNode.nextElementSibling;
+                        next = next || formatEl.nextElementSibling || (rangeEl.parentNode ? rangeEl.parentNode.nextElementSibling : null);
                         if (next && (util.isList(next) || util.getArrayItem(next.children, util.isList, false))) {
                             e.preventDefault();
 
@@ -7918,6 +7923,11 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 core.setRange(selectionNode, so < 0 ? 0 : so, selectionNode, eo < 0 ? 0 : eo);
             }
 
+            if (event._deleteKeyCode.test(keyCode) && formatEl && util.onlyZeroWidthSpace(formatEl.textContent) && !formatEl.previousElementSibling) {
+                formatEl.innerHTML = '<br>';
+                core.setRange(formatEl, 0, formatEl, 0);
+            }
+
             core._charCount('');
 
             // user event

package/src/lib/history.d.ts

@@ -1,48 +1,48 @@
-import { Core } from "./core";
-
-export interface History {
-    /**
-     * @description History stack
-     */
-    stack: any[];
-    /**
-     * @description Saving the current status to the history object stack
-     * If "delay" is true, it will be saved after (options.historyStackDelayTime || 400) miliseconds
-     * If the function is called again with the "delay" argument true before it is saved, the delay time is renewal
-     * You can specify the delay time by sending a number.
-     * @param {Boolean} delay If true, Add stack without delay time.
-     */
-    push: (delay: boolean | number) => void;
-    /**
-     * @description Undo function
-     */
-    undo: () => void;
-    /**
-     * @description Redo function
-     */
-    redo: () => void;
-    /**
-     * @description Go to the history stack for that index.
-     * If "index" is -1, go to the last stack
-     * @param {Number} index Stack index
-     */
-    go: (index: number) => void;
-
-    /**
-     * @description Get the current history stack index.
-     * @returns
-     */
-    getCurrentIndex: () => number;
-    
-    /**
-     * @description Reset the history object
-     */
-    reset: (ignoreChangeEvent: any) => void;
-    /**
-     * @description Remove all stacks and remove the timeout function.
-     * @private
-     */
-    _destroy: () => void;
-}
-
-export default function _default(core: Core, change: any): History;
+import { Core } from "./core";
+
+export interface History {
+    /**
+     * @description History stack
+     */
+    stack: any[];
+    /**
+     * @description Saving the current status to the history object stack
+     * If "delay" is true, it will be saved after (options.historyStackDelayTime || 400) miliseconds
+     * If the function is called again with the "delay" argument true before it is saved, the delay time is renewal
+     * You can specify the delay time by sending a number.
+     * @param {Boolean} delay If true, Add stack without delay time.
+     */
+    push: (delay: boolean | number) => void;
+    /**
+     * @description Undo function
+     */
+    undo: () => void;
+    /**
+     * @description Redo function
+     */
+    redo: () => void;
+    /**
+     * @description Go to the history stack for that index.
+     * If "index" is -1, go to the last stack
+     * @param {Number} index Stack index
+     */
+    go: (index: number) => void;
+
+    /**
+     * @description Get the current history stack index.
+     * @returns
+     */
+    getCurrentIndex: () => number;
+    
+    /**
+     * @description Reset the history object
+     */
+    reset: (ignoreChangeEvent: any) => void;
+    /**
+     * @description Remove all stacks and remove the timeout function.
+     * @private
+     */
+    _destroy: () => void;
+}
+
+export default function _default(core: Core, change: any): History;

package/src/lib/history.js

@@ -1,219 +1,219 @@
-/*
- * wysiwyg web editor
- *
- * suneditor.js
- * Copyright 2019 JiHong Lee.
- * MIT license.
- */
-'use strict';
-
-export default function (core, change) {
-    const _w = core._w;
-    const util = core.util;
-    const delayTime = core.options.historyStackDelayTime;
-    let editor = core.context.element;
-    let undo = core.context.tool.undo;
-    let redo = core.context.tool.redo;
-
-    let pushDelay = null;
-    let stackIndex = 0;
-    let stack = [];
-
-    function setContentsFromStack () {
-        const item = stack[stackIndex];
-        editor.wysiwyg.innerHTML = item.contents;
-
-        core.setRange(util.getNodeFromPath(item.s.path, editor.wysiwyg), item.s.offset, util.getNodeFromPath(item.e.path, editor.wysiwyg), item.e.offset);
-        core.focus();
-
-        if (stack.length <= 1) {
-            if (undo) undo.setAttribute('disabled', true);
-            if (redo) redo.setAttribute('disabled', true);
-        } else {
-            if (stackIndex === 0) {
-                if (undo) undo.setAttribute('disabled', true);
-                if (redo) redo.removeAttribute('disabled');
-            } else if (stackIndex === stack.length - 1) {
-                if (undo) undo.removeAttribute('disabled');
-                if (redo) redo.setAttribute('disabled', true);
-            } else {
-                if (undo) undo.removeAttribute('disabled');
-                if (redo) redo.removeAttribute('disabled');
-            }
-        }
-
-        core.controllersOff();
-        core._checkComponents();
-        core._setCharCount();
-        core._resourcesStateChange();
-        
-        // onChange
-        change();
-    }
-
-    function pushStack () {
-        core._checkComponents();
-        const current = editor.wysiwyg.innerHTML;
-        if (!current || (!!stack[stackIndex] && current === stack[stackIndex].contents)) return;
-
-        stackIndex++;
-        const range = core._variable._range;
-
-        if (stack.length > stackIndex) {
-            stack = stack.slice(0, stackIndex);
-            if (redo) redo.setAttribute('disabled', true);
-        }
-
-        if (!range) {
-            stack[stackIndex] = {
-                contents: current,
-                s: { path: [0, 0], offset: [0, 0] },
-                e: { path: 0, offset: 0 }
-            };
-        } else {
-            stack[stackIndex] = {
-                contents: current,
-                s: {
-                    path: util.getNodePath(range.startContainer, null, null),
-                    offset: range.startOffset
-                },
-                e: {
-                    path: util.getNodePath(range.endContainer, null, null),
-                    offset: range.endOffset
-                }
-            };
-        }
-
-        if (stackIndex === 1 && undo) undo.removeAttribute('disabled');
-
-        core._setCharCount();
-        // onChange
-        change();
-    }
-
-    return {
-        /**
-         * @description History stack
-         */
-        stack: stack,
-
-        /**
-         * @description Saving the current status to the history object stack
-         * If "delay" is true, it will be saved after (options.historyStackDelayTime || 400) miliseconds
-         * If the function is called again with the "delay" argument true before it is saved, the delay time is renewal
-         * You can specify the delay time by sending a number.
-         * @param {Boolean|Number} delay If true, Add stack without delay time.
-         */
-        push: function (delay) {
-            _w.setTimeout(core._resourcesStateChange.bind(core));
-            const time = typeof delay === 'number' ? (delay > 0 ? delay : 0) : (!delay ? 0 : delayTime);
-            
-            if (!time || pushDelay) {
-                _w.clearTimeout(pushDelay);
-                if (!time) {
-                    pushStack();
-                    return;
-                }
-            }
-
-            pushDelay = _w.setTimeout(function () {
-                _w.clearTimeout(pushDelay);
-                pushDelay = null;
-                pushStack();
-            }, time);
-        },
-
-        /**
-         * @description Undo function
-         */
-        undo: function () {
-            if (stackIndex > 0) {
-                stackIndex--;
-                setContentsFromStack();
-            }
-        },
-
-        /**
-         * @description Redo function
-         */
-        redo: function () {
-            if (stack.length - 1 > stackIndex) {
-                stackIndex++;
-                setContentsFromStack();
-            }
-        },
-
-        /**
-         * @description Go to the history stack for that index.
-         * If "index" is -1, go to the last stack
-         */
-        go: function (index) {
-            stackIndex = index < 0 ? (stack.length - 1) : index;
-            setContentsFromStack();
-        },
-
-        /**
-         * @description Get the current history stack index.
-         * @returns {Number} Current Stack index
-         */
-        getCurrentIndex: function () {
-            return stackIndex;
-        },
-        
-        /**
-         * @description Reset the history object
-         */
-        reset: function (ignoreChangeEvent) {
-            if (undo) undo.setAttribute('disabled', true);
-            if (redo) redo.setAttribute('disabled', true);
-            core._variable.isChanged = false;
-            if (core.context.tool.save) core.context.tool.save.setAttribute('disabled', true);
-            
-            stack.splice(0);
-            stackIndex = 0;
-
-            // pushStack
-            stack[stackIndex] = {
-                contents: core.getContents(true),
-                s: {
-                    path: [0, 0],
-                    offset: 0
-                },
-                e: {
-                    path: [0, 0],
-                    offset: 0
-                }
-            };
-
-            if (!ignoreChangeEvent) change();
-        },
-
-        /**
-         * @description Reset the disabled state of the buttons to fit the current stack.
-         * @private
-         */
-        _resetCachingButton: function () {
-            editor = core.context.element;
-            undo = core.context.tool.undo;
-            redo = core.context.tool.redo;
-
-            if (stackIndex === 0) {
-                if (undo) undo.setAttribute('disabled', true);
-                if (redo && stackIndex === stack.length - 1) redo.setAttribute('disabled', true);
-                core._variable.isChanged = false;
-                if (core.context.tool.save) core.context.tool.save.setAttribute('disabled', true);
-            } else if (stackIndex === stack.length - 1) {
-                if (redo) redo.setAttribute('disabled', true);
-            }
-        },
-
-        /**
-         * @description Remove all stacks and remove the timeout function.
-         * @private
-         */
-        _destroy: function () {
-            if (pushDelay) _w.clearTimeout(pushDelay);
-            stack = null;
-        }
-    };
+/*
+ * wysiwyg web editor
+ *
+ * suneditor.js
+ * Copyright 2019 JiHong Lee.
+ * MIT license.
+ */
+'use strict';
+
+export default function (core, change) {
+    const _w = core._w;
+    const util = core.util;
+    const delayTime = core.options.historyStackDelayTime;
+    let editor = core.context.element;
+    let undo = core.context.tool.undo;
+    let redo = core.context.tool.redo;
+
+    let pushDelay = null;
+    let stackIndex = 0;
+    let stack = [];
+
+    function setContentsFromStack () {
+        const item = stack[stackIndex];
+        editor.wysiwyg.innerHTML = item.contents;
+
+        core.setRange(util.getNodeFromPath(item.s.path, editor.wysiwyg), item.s.offset, util.getNodeFromPath(item.e.path, editor.wysiwyg), item.e.offset);
+        core.focus();
+
+        if (stack.length <= 1) {
+            if (undo) undo.setAttribute('disabled', true);
+            if (redo) redo.setAttribute('disabled', true);
+        } else {
+            if (stackIndex === 0) {
+                if (undo) undo.setAttribute('disabled', true);
+                if (redo) redo.removeAttribute('disabled');
+            } else if (stackIndex === stack.length - 1) {
+                if (undo) undo.removeAttribute('disabled');
+                if (redo) redo.setAttribute('disabled', true);
+            } else {
+                if (undo) undo.removeAttribute('disabled');
+                if (redo) redo.removeAttribute('disabled');
+            }
+        }
+
+        core.controllersOff();
+        core._checkComponents();
+        core._setCharCount();
+        core._resourcesStateChange();
+        
+        // onChange
+        change();
+    }
+
+    function pushStack () {
+        core._checkComponents();
+        const current = editor.wysiwyg.innerHTML;
+        if (!current || (!!stack[stackIndex] && current === stack[stackIndex].contents)) return;
+
+        stackIndex++;
+        const range = core._variable._range;
+
+        if (stack.length > stackIndex) {
+            stack = stack.slice(0, stackIndex);
+            if (redo) redo.setAttribute('disabled', true);
+        }
+
+        if (!range) {
+            stack[stackIndex] = {
+                contents: current,
+                s: { path: [0, 0], offset: [0, 0] },
+                e: { path: 0, offset: 0 }
+            };
+        } else {
+            stack[stackIndex] = {
+                contents: current,
+                s: {
+                    path: util.getNodePath(range.startContainer, null, null),
+                    offset: range.startOffset
+                },
+                e: {
+                    path: util.getNodePath(range.endContainer, null, null),
+                    offset: range.endOffset
+                }
+            };
+        }
+
+        if (stackIndex === 1 && undo) undo.removeAttribute('disabled');
+
+        core._setCharCount();
+        // onChange
+        change();
+    }
+
+    return {
+        /**
+         * @description History stack
+         */
+        stack: stack,
+
+        /**
+         * @description Saving the current status to the history object stack
+         * If "delay" is true, it will be saved after (options.historyStackDelayTime || 400) miliseconds
+         * If the function is called again with the "delay" argument true before it is saved, the delay time is renewal
+         * You can specify the delay time by sending a number.
+         * @param {Boolean|Number} delay If true, Add stack without delay time.
+         */
+        push: function (delay) {
+            _w.setTimeout(core._resourcesStateChange.bind(core));
+            const time = typeof delay === 'number' ? (delay > 0 ? delay : 0) : (!delay ? 0 : delayTime);
+            
+            if (!time || pushDelay) {
+                _w.clearTimeout(pushDelay);
+                if (!time) {
+                    pushStack();
+                    return;
+                }
+            }
+
+            pushDelay = _w.setTimeout(function () {
+                _w.clearTimeout(pushDelay);
+                pushDelay = null;
+                pushStack();
+            }, time);
+        },
+
+        /**
+         * @description Undo function
+         */
+        undo: function () {
+            if (stackIndex > 0) {
+                stackIndex--;
+                setContentsFromStack();
+            }
+        },
+
+        /**
+         * @description Redo function
+         */
+        redo: function () {
+            if (stack.length - 1 > stackIndex) {
+                stackIndex++;
+                setContentsFromStack();
+            }
+        },
+
+        /**
+         * @description Go to the history stack for that index.
+         * If "index" is -1, go to the last stack
+         */
+        go: function (index) {
+            stackIndex = index < 0 ? (stack.length - 1) : index;
+            setContentsFromStack();
+        },
+
+        /**
+         * @description Get the current history stack index.
+         * @returns {Number} Current Stack index
+         */
+        getCurrentIndex: function () {
+            return stackIndex;
+        },
+        
+        /**
+         * @description Reset the history object
+         */
+        reset: function (ignoreChangeEvent) {
+            if (undo) undo.setAttribute('disabled', true);
+            if (redo) redo.setAttribute('disabled', true);
+            core._variable.isChanged = false;
+            if (core.context.tool.save) core.context.tool.save.setAttribute('disabled', true);
+            
+            stack.splice(0);
+            stackIndex = 0;
+
+            // pushStack
+            stack[stackIndex] = {
+                contents: core.getContents(true),
+                s: {
+                    path: [0, 0],
+                    offset: 0
+                },
+                e: {
+                    path: [0, 0],
+                    offset: 0
+                }
+            };
+
+            if (!ignoreChangeEvent) change();
+        },
+
+        /**
+         * @description Reset the disabled state of the buttons to fit the current stack.
+         * @private
+         */
+        _resetCachingButton: function () {
+            editor = core.context.element;
+            undo = core.context.tool.undo;
+            redo = core.context.tool.redo;
+
+            if (stackIndex === 0) {
+                if (undo) undo.setAttribute('disabled', true);
+                if (redo && stackIndex === stack.length - 1) redo.setAttribute('disabled', true);
+                core._variable.isChanged = false;
+                if (core.context.tool.save) core.context.tool.save.setAttribute('disabled', true);
+            } else if (stackIndex === stack.length - 1) {
+                if (redo) redo.setAttribute('disabled', true);
+            }
+        },
+
+        /**
+         * @description Remove all stacks and remove the timeout function.
+         * @private
+         */
+        _destroy: function () {
+            if (pushDelay) _w.clearTimeout(pushDelay);
+            stack = null;
+        }
+    };
 }