suneditor 2.44.9 → 2.44.11

package/package.json

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

package/src/assets/css/suneditor-contents.css

@@ -415,8 +415,13 @@
 .sun-editor-editable figure {
     display: block;
     outline: none;
-    margin: 0;
     padding: 0;
+    margin: 0;
+}
+.sun-editor-editable .__se__float-left figure,
+.sun-editor-editable .__se__float-right figure,
+.sun-editor-editable .__se__float-center figure {
+    margin: auto !important;
 }
 .sun-editor-editable figure figcaption {
     padding: 1em .5em;

package/src/assets/css/suneditor.css

@@ -212,7 +212,7 @@
 .sun-editor .se-list-layer.se-list-line {width:125px;}
 .sun-editor .se-list-layer.se-list-line hr {border-width: 1px 0 0; height: 1px;}
 /* submenu layer - align */
-.sun-editor .se-list-layer.se-list-align .se-list-inner {left:9px; width:125px;}
+.sun-editor .se-list-layer.se-list-align .se-list-inner {left:9px;}
 /** submenu layer - format block, paragraph style, text style */
 .sun-editor .se-list-layer.se-list-format {min-width:156px;}
 .sun-editor .se-list-layer.se-list-format li {padding:0; width:100%;}

package/src/lang/de.js

@@ -101,12 +101,12 @@
                 altText: 'Alternativer Text'
             },
             videoBox: {
-                title: 'Video enfügen',
+                title: 'Video einfügen',
                 file: 'Datei auswählen',
                 url: 'Video-URL, YouTube/Vimeo'
             },
             audioBox: {
-                title: 'Audio enfügen',
+                title: 'Audio einfügen',
                 file: 'Datei auswählen',
                 url: 'Audio-URL'
             },
@@ -185,4 +185,4 @@
     }
 
     return lang;
-}));
+}));

package/src/lib/core.js

@@ -1792,30 +1792,30 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
                 } else if (container.nodeType === 3 || util.isBreak(container) || insertListCell) {
                     const depthFormat = util.getParentElement(container, function (current) { return this.isRangeFormatElement(current) || this.isListCell(current); }.bind(util));
                     afterNode = util.splitElement(container, r.offset, !depthFormat ? 0 : util.getElementDepth(depthFormat) + 1);
-                    if (afterNode) {
-                        if (insertListCell) {
-                            if (line.contains(container)) {
-                                const subList = util.isList(line.lastElementChild);
-                                let newCell = null;
-                                if (!isEdge) {
+                    if (!afterNode) {
+                        tempAfterNode = afterNode = line;
+                    } else if (insertListCell) {
+                        if (line.contains(container)) {
+                            const subList = util.isList(line.lastElementChild);
+                            let newCell = null;
+                            if (!isEdge) {
+                                newCell = line.cloneNode(false);
+                                newCell.appendChild(afterNode.textContent.trim() ? afterNode : util.createTextNode(util.zeroWidthSpace));
+                            }
+                            if (subList) {
+                                if (!newCell) {
                                     newCell = line.cloneNode(false);
-                                    newCell.appendChild(afterNode.textContent.trim() ? afterNode : util.createTextNode(util.zeroWidthSpace));
-                                }
-                                if (subList) {
-                                    if (!newCell) {
-                                        newCell = line.cloneNode(false);
-                                        newCell.appendChild(util.createTextNode(util.zeroWidthSpace));
-                                    }
-                                    newCell.appendChild(line.lastElementChild);
-                                }
-                                if (newCell) {
-                                    line.parentNode.insertBefore(newCell, line.nextElementSibling);
-                                    tempAfterNode = afterNode = newCell;
+                                    newCell.appendChild(util.createTextNode(util.zeroWidthSpace));
                                 }
+                                newCell.appendChild(line.lastElementChild);
+                            }
+                            if (newCell) {
+                                line.parentNode.insertBefore(newCell, line.nextElementSibling);
+                                tempAfterNode = afterNode = newCell;
                             }
-                        } else {
-                            afterNode = afterNode.previousSibling;
                         }
+                    } else {
+                        afterNode = afterNode.previousSibling;
                     }
                 }
             }
@@ -2135,7 +2135,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
 
             const range = this.getRange();
             const isStartEdge = range.startOffset === 0;
-            const isEndEdge = core.isEdgePoint(range.endContainer, range.endOffset);
+            const isEndEdge = core.isEdgePoint(range.endContainer, range.endOffset, 'end');
             let prevContainer = null;
             let startPrevEl = null;
             let endNextEl = null;
@@ -3288,7 +3288,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             if (!isRemoveNode && parentCon === endCon.parentNode && parentCon.nodeName === newInnerNode.nodeName) {
                 if (util.onlyZeroWidthSpace(startCon.textContent.slice(0, startOff)) && util.onlyZeroWidthSpace(endCon.textContent.slice(endOff))) {
                     const children = parentCon.childNodes;
-                    let sameTag = true;
+                    let sameTag = false;
     
                     for (let i = 0, len = children.length, c, s, e, z; i < len; i++) {
                         c = children[i];
@@ -5141,12 +5141,12 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             const renderHTML = util.createElement('DIV');
             renderHTML.innerHTML = contents;
 
-            const figcaptions = util.getListChildren(renderHTML, function (current) {
-                return /FIGCAPTION/i.test(current.nodeName);
+            const editableEls = util.getListChildren(renderHTML, function (current) {
+                return current.hasAttribute('contenteditable');
             });
 
-            for (let i = 0, len = figcaptions.length; i < len; i++) {
-                figcaptions[i].removeAttribute('contenteditable');
+            for (let i = 0, len = editableEls.length; i < len; i++) {
+                editableEls[i].removeAttribute('contenteditable');
             }
 
             if (options.fullPage && !onlyContents) {
@@ -5373,13 +5373,7 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             if (util.isFigures(tagName)) {
                 const sv = m.match(/style\s*=\s*(?:"|')[^"']*(?:"|')/);
                 if (!v) v = [];
-                if (sv) {
-                    const wsize = sv[0].match(/width\s?:\s?(\d+)(px|%)/);
-                    const hsize = sv[0].match(/height\s?:\s?(\d+)(px|%)/);
-                    const w_ = wsize && wsize[1] && wsize[2] ? wsize[1] + wsize[2] : 'auto';
-                    const h_ = hsize && hsize[1] && hsize[2] ? hsize[1] + hsize[2] : 'auto';
-                    v.push('style="width:'+ w_ + '; height:'+ h_ + ';"');
-                }
+                if (sv) v.push(sv[0]);
             }
 
             if (v) {
@@ -6454,11 +6448,6 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             if (options.showPathLabel) context.element.navigation.textContent = core._variable.currentNodes.join(' > ');
         },
 
-        _cancelCaptionEdit: function () {
-            this.setAttribute('contenteditable', false);
-            this.removeEventListener('blur', event._cancelCaptionEdit);
-        },
-
         _buttonsEventHandler: function (e) {
             let target = e.target;
             if (core._bindControllersOff) e.stopPropagation();
@@ -6510,6 +6499,12 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
 
         onMouseDown_wysiwyg: function (e) {
             if (core.isReadOnly || util.isNonEditable(context.element.wysiwyg)) return;
+            if (util._isExcludeSelectionElement(e.target)) {
+                e.preventDefault();
+                return;
+            }
+
+            _w.setTimeout(core._editorRange.bind(core));
 
             // user event
             if (typeof functions.onMouseDown === 'function' && functions.onMouseDown(e, core) === false) return;
@@ -6527,8 +6522,6 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             if (core._isBalloon) {
                 event._hideToolbar();
             }
-
-            if (/FIGURE/i.test(e.target.nodeName)) e.preventDefault();
         },
 
         onClick_wysiwyg: function (e) {
@@ -6555,9 +6548,8 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
             }
 
             const figcaption = util.getParentElement(targetElement, 'FIGCAPTION');
-            if (figcaption && (util.isNonEditable(figcaption) || !figcaption.getAttribute("contenteditable"))) {
+            if (figcaption && util.isNonEditable(figcaption)) {
                 e.preventDefault();
-                figcaption.setAttribute('contenteditable', true);
                 figcaption.focus();
 
                 if (core._isInline && !core._inlineToolbarAttr.isShow) {
@@ -7723,7 +7715,6 @@ export default function (context, pluginCallButtons, plugins, lang, options, _re
 
         onMouseDown_resizingBar: function (e) {
             e.stopPropagation();
-            _w.setTimeout(core._editorRange.bind(core));
 
             core.submenuOff();
             core.controllersOff();

package/src/lib/history.js

@@ -53,7 +53,7 @@ export default function (core, change) {
 
     function pushStack () {
         core._checkComponents();
-        const current = core.getContents(true);
+        const current = editor.wysiwyg.innerHTML;
         if (!current || (!!stack[stackIndex] && current === stack[stackIndex].contents)) return;
 
         stackIndex++;

package/src/lib/util.js

@@ -1749,6 +1749,10 @@ const util = {
         }.bind(this));
     },
 
+    _isExcludeSelectionElement: function (element) {
+        return !/FIGCAPTION/i.test(element.nodeName) && (this.isComponent(element) || /FIGURE/i.test(element.nodeName));
+    },
+
     /**
      * @description Nodes that need to be added without modification when changing text nodes
      * @param {Node} element Element to check

package/src/plugins/dialog/image.js

@@ -660,7 +660,6 @@ export default {
         // caption
         if (contextImage._captionChecked) {
             contextImage._caption = this.plugins.component.create_caption.call(this);
-            contextImage._caption.setAttribute('contenteditable', false);
             cover.appendChild(contextImage._caption);
         }
 
@@ -869,7 +868,7 @@ export default {
         contextImage._cover = this.util.getParentElement(element, 'FIGURE');
         contextImage._container = this.util.getParentElement(element, this.util.isMediaComponent);
         contextImage._caption = this.util.getChildElement(contextImage._cover, 'FIGCAPTION');
-        contextImage._align = element.style.float || element.getAttribute('data-align') || 'none';
+        contextImage._align =  element.getAttribute('data-align') || element.style.float || 'none';
         element.style.float = '';
         this.plugins.anchor.setCtx(contextImage._linkElement, contextImage.anchorCtx);
 
@@ -1068,12 +1067,6 @@ export default {
         if (!cover) cover = contextImage._cover;
         if (!container) container = contextImage._container;
 
-        if (align && align !== 'none') {
-            cover.style.margin = 'auto';
-        } else {
-            cover.style.margin = '0';
-        }
-
         if (/%$/.test(element.style.width) && align === 'center') {
             container.style.minWidth = '100%';
             cover.style.width = container.style.width;

package/src/plugins/dialog/math.js

@@ -135,6 +135,7 @@ export default {
                 if (!element.getAttribute('data-exp') || !this.options.katex) return;
                 const dom = this._d.createRange().createContextualFragment(this.plugins.math._renderer.call(this, this.util.HTMLDecoder(element.getAttribute('data-exp'))));
                 element.innerHTML = dom.querySelector('.katex').innerHTML;
+                element.setAttribute('contenteditable', false);
             }
         };
     },

package/src/plugins/dialog/video.js

@@ -931,12 +931,6 @@ export default {
         if (!cover) cover = contextVideo._cover;
         if (!container) container = contextVideo._container;
 
-        if (align && align !== 'none') {
-            cover.style.margin = 'auto';
-        } else {
-            cover.style.margin = '0';
-        }
-
         if (/%$/.test(element.style.width) && align === 'center') {
             container.style.minWidth = '100%';
             cover.style.width = container.style.width;

package/src/plugins/fileBrowser/imageGallery.js

@@ -55,9 +55,9 @@ export default {
                 '</div>';
     },
 
-    setImage: function (target) {
+    setImage: function (target, fileName) {
         this.callPlugin('image', function () {
-            const file = {name: target.parentNode.querySelector('.__se__img_name').textContent, size: 0};
+            const file = {name: fileName, size: 0};
             this.plugins.image.create_image.call(this, target.getAttribute('data-value'), null, this.context.image._origin_w, this.context.image._origin_h, 'none', file, target.alt);
         }.bind(this), null);
     }

package/src/plugins/modules/component.js

@@ -32,7 +32,6 @@
         set_container: function (cover, className) {
             const container = this.util.createElement('DIV');
             container.className = 'se-component ' + className;
-            container.setAttribute('contenteditable', false);
             container.appendChild(cover);
     
             return container;
@@ -55,7 +54,6 @@
          */
         create_caption: function () {
             const caption = this.util.createElement('FIGCAPTION');
-            caption.setAttribute('contenteditable', true);
             caption.innerHTML = '<div>' + this.lang.dialogBox.caption + '</div>';
             return caption;
         }

package/src/plugins/modules/fileBrowser.js

@@ -347,8 +347,8 @@
             if (!command) return;
 
             const handler = (fileBrowserContext.selectorHandler || this.context[fileBrowserContext.contextPlugin].selectorHandler);
+            handler(target, target.parentNode.querySelector('.__se__img_name').textContent);
             this.plugins.fileBrowser.close.call(this);
-            handler(target);
         }
     };