suneditor 2.42.0 → 2.43.2

package/src/lib/util.js

@@ -16,6 +16,7 @@ const util = {
     isIE: null,
     isIE_Edge: null,
     isOSX_IOS: null,
+    isChromium: null,
     _propertiesInit: function () {
         if (this._d) return;
         this._d =  document;
@@ -23,6 +24,7 @@ const util = {
         this.isIE = navigator.userAgent.indexOf('Trident') > -1;
         this.isIE_Edge = (navigator.userAgent.indexOf('Trident') > -1) || (navigator.appVersion.indexOf('Edge') > -1);
         this.isOSX_IOS = /(Mac|iPhone|iPod|iPad)/.test(navigator.platform);
+        this.isChromium = !!window.chrome;
     },
 
     _allowedEmptyNodeList: '.se-component, pre, blockquote, hr, li, table, img, iframe, video, audio, canvas',
@@ -61,6 +63,7 @@ const util = {
      * @returns {Boolean}
      */
     onlyZeroWidthSpace: function (text) {
+        if (text === null || text === undefined) return false;
         if (typeof text !== 'string') text = text.textContent;
         return text === '' || this.onlyZeroWidthRegExp.test(text);
     },
@@ -92,6 +95,30 @@ const util = {
         }
     },
 
+    /**
+     * @description Object.values
+     * @param {Object|null} obj Object parameter.
+     * @returns {Array}
+     */
+    getValues: function (obj) {
+        return !obj ? [] : this._w.Object.keys(obj).map(function (i) {
+            return obj[i];
+        });
+    },
+
+    /**
+     * @description Convert the CamelCase To the KebabCase.
+     * @param {String|Array} param [Camel string]
+     * @returns {String|Array}
+     */
+    camelToKebabCase: function (param) {
+        if (typeof param === 'string') {
+            return param.replace(/[A-Z]/g, function (letter) { return "-" + letter.toLowerCase(); });
+        } else {
+            return param.map(function(str) { return util.camelToKebabCase(str); });
+        }
+    },
+
     /**
      * @description Create Element node
      * @param {String} elementName Element name
@@ -1733,7 +1760,10 @@ const util = {
 
         // wrong position
         const wrongTags = this.getListChildNodes(documentFragment, function (current) {
-            if (current.nodeType !== 1) return false;
+            if (current.nodeType !== 1) {
+                if (this.isList(current.parentNode)) removeTags.push(current);
+                return false;
+            }
 
             // white list
             if (htmlCheckBlacklistRegExp.test(current.nodeName) || (!htmlCheckWhitelistRegExp.test(current.nodeName) && current.childNodes.length === 0 && this.isNotCheckingNode(current))) {

package/src/options.d.ts

@@ -24,6 +24,10 @@ export interface SunEditorOptions {
      * If not, the value of the "target textarea".
      */
     value?: string;
+    /**
+     * When recording the history stack, this is the delay time (miliseconds) since the last input. default: 400
+     */
+    historyStackDelayTime?: number;
     /**
      * Whitelist
      * ======
@@ -221,8 +225,19 @@ export interface SunEditorOptions {
      */
     maxHeight?: string;
     /** 
-     * Editing area default style 
+     * Editing area
+     * ===================
     */
+    /**
+     * Add a "class" to the editing area[.sun-editor-editable]
+     */
+    className?: string;
+    /**
+     * You can define the style of the editing area[.sun-editor-editable].
+     * It affects the entire editing area.
+     * ('z-index', 'position' and 'width' properties apply to the top div.)
+     * @example 'font-family: cursive; font-size: 10px;'
+     */
     defaultStyle?: string;
     /**
      * Defining menu items

package/src/plugins/dialog/link.js

@@ -118,6 +118,7 @@ export default {
 
         try {
             const oA = this.plugins.anchor.createAnchor.call(this, this.context.anchor.caller.link, false);
+            if (oA === null) return;
     
             if (!this.context.dialog.updateModal) {
                 const selectedFormats = this.getSelectedElements();

package/src/plugins/dialog/video.js

@@ -817,12 +817,13 @@ 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 : '';
 
-        if (!onlyH) contextVideo._element.style.width = w ? w + contextVideo.sizeUnit : '';
+        if (!onlyH) contextVideo._element.style.width = w;
         if (!onlyW) contextVideo._cover.style.paddingBottom = contextVideo._cover.style.height = h;
 
         if (!onlyH && !/%$/.test(w)) {
-            contextVideo._cover.style.width = '';
+            contextVideo._cover.style.width = w;
             contextVideo._container.style.width = '';
         }
 

package/src/plugins/modules/_anchor.js

@@ -119,25 +119,32 @@ export default {
     },
 
     on: function (contextAnchor, update) {
+        const anchorPlugin = this.plugins.anchor;
+
         if (!update) {
-            this.plugins.anchor.init.call(this, contextAnchor);
+            anchorPlugin.init.call(this, contextAnchor);
             contextAnchor.anchorText.value = this.getSelection().toString().trim();
             contextAnchor.newWindowCheck.checked = this.options.linkTargetNewWindow;
         } else if (contextAnchor.linkAnchor) {
             this.context.dialog.updateModal = true;
             const href = this.options.linkNoPrefix ? contextAnchor.linkAnchor.href.replace(contextAnchor.linkAnchor.origin + '/', '') : contextAnchor.linkAnchor.href;
-            contextAnchor.linkValue = contextAnchor.preview.textContent = contextAnchor.urlInput.value = /\#.+$/.test(href) ? href.substr(href.lastIndexOf('#')) : href;
+            contextAnchor.linkValue = contextAnchor.preview.textContent = contextAnchor.urlInput.value = anchorPlugin.selfPathBookmark.call(this, href) ? href.substr(href.lastIndexOf('#')) : href;
             contextAnchor.anchorText.value = contextAnchor.linkAnchor.textContent || contextAnchor.linkAnchor.getAttribute('alt');
             contextAnchor.newWindowCheck.checked = (/_blank/i.test(contextAnchor.linkAnchor.target) ? true : false);
             contextAnchor.downloadCheck.checked = contextAnchor.linkAnchor.download;
         }
 
         this.context.anchor.callerContext = contextAnchor;
-        this.plugins.anchor.setRel.call(this, contextAnchor, (update && contextAnchor.linkAnchor) ? contextAnchor.linkAnchor.rel : contextAnchor.defaultRel);
-        this.plugins.anchor.setLinkPreview.call(this, contextAnchor, contextAnchor.linkValue);
+        anchorPlugin.setRel.call(this, contextAnchor, (update && contextAnchor.linkAnchor) ? contextAnchor.linkAnchor.rel : contextAnchor.defaultRel);
+        anchorPlugin.setLinkPreview.call(this, contextAnchor, contextAnchor.linkValue);
         this.plugins.selectMenu.on.call(this, contextAnchor.callerName, this.plugins.anchor.setHeaderBookmark);
     },
 
+    selfPathBookmark: function(path) {
+        const href = this._w.location.href.replace(/\/$/, '');
+        return path.indexOf('#') === 0 || (path.indexOf(href) === 0 && path.indexOf('#') === (href.indexOf("#") === -1 ? href.length : href.substr(0, href.indexOf("#")).length));
+    },
+
     _closeRelMenu: null,
     toggleRelList: function (contextAnchor, show) {
         if (!show) {
@@ -278,13 +285,13 @@ export default {
         const value = e.target.value.trim();
         this.plugins.anchor.setLinkPreview.call(this, contextAnchor, value);
 
-        if (/^#/.test(value)) this.plugins.anchor.createHeaderList.call(this, contextAnchor, this.context.selectMenu.callerContext, value);
+        if (this.plugins.anchor.selfPathBookmark.call(this, value)) this.plugins.anchor.createHeaderList.call(this, contextAnchor, this.context.selectMenu.callerContext, value);
         else this.plugins.selectMenu.close.call(this, this.context.selectMenu.callerContext);
     },
 
     onFocusUrlInput: function (contextAnchor, contextLink) {
         const value = contextAnchor.urlInput.value;
-        if (/^#/.test(value)) this.plugins.anchor.createHeaderList.call(this, contextAnchor, contextLink, value);
+        if (this.plugins.anchor.selfPathBookmark.call(this, value)) this.plugins.anchor.createHeaderList.call(this, contextAnchor, contextLink, value);
     },
 
     onBlurUrlInput: function (contextList) {
@@ -297,9 +304,9 @@ export default {
         const noPrefix = this.options.linkNoPrefix;
         const reservedProtocol  = /^(mailto\:|tel\:|sms\:|https*\:\/\/|#)/.test(value);
         const sameProtocol = !protocol ? false : this._w.RegExp('^' + value.substr(0, protocol.length)).test(protocol);
-        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;
+        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 (value.indexOf('#') === 0) {
+        if (this.plugins.anchor.selfPathBookmark.call(this, value)) {
             context.bookmark.style.display = 'block';
             this.util.addClass(context.bookmarkButton, 'active');
         } else {
@@ -307,7 +314,7 @@ export default {
             this.util.removeClass(context.bookmarkButton, 'active');
         }
 
-        if (value.indexOf('#') === -1 && context.downloadCheck.checked) {
+        if (!this.plugins.anchor.selfPathBookmark.call(this, value) && context.downloadCheck.checked) {
             context.download.style.display = 'block';
         } else {
             context.download.style.display = 'none';
@@ -323,7 +330,7 @@ export default {
 
     updateAnchor: function (anchor, url, alt, contextAnchor, notText) {
         // download
-        if (!/^\#/.test(url) && contextAnchor.downloadCheck.checked) {
+        if (!this.plugins.anchor.selfPathBookmark.call(this, url) && contextAnchor.downloadCheck.checked) {
             anchor.setAttribute('download', alt || url);
         } else {
             anchor.removeAttribute('download');
@@ -356,7 +363,7 @@ export default {
         const anchorText = anchor.value.length === 0 ? url : anchor.value;
 
         const oA = contextAnchor.linkAnchor || this.util.createElement('A');
-        this.plugins.anchor.updateAnchor(oA, url, anchorText, contextAnchor, notText);
+        this.plugins.anchor.updateAnchor.call(this, oA, url, anchorText, contextAnchor, notText);
 
         contextAnchor.linkValue = contextAnchor.preview.textContent = contextAnchor.urlInput.value = contextAnchor.anchorText.value = '';
 
@@ -365,7 +372,7 @@ export default {
 
     onClick_bookmarkButton: function (contextAnchor) {
         let url = contextAnchor.urlInput.value;
-        if (/^\#/.test(url)) {
+        if (this.plugins.anchor.selfPathBookmark.call(this, url)) {
             url = url.substr(1);
             contextAnchor.bookmark.style.display = 'none';
             this.util.removeClass(contextAnchor.bookmarkButton, 'active');

package/src/plugins/submenu/fontSize.js

@@ -61,7 +61,7 @@ export default {
      */
     active: function (element) {
         if (!element) {
-            this.util.changeTxt(this.context.fontSize.targetText, this.hasFocus ? this.wwComputedStyle.fontSize : this.lang.toolbar.fontSize);
+            this.util.changeTxt(this.context.fontSize.targetText, this.hasFocus ? (this.options.__defaultFontSize || this.wwComputedStyle.fontSize) : this.lang.toolbar.fontSize);
         } else if (element.style && element.style.fontSize.length > 0) {
             this.util.changeTxt(this.context.fontSize.targetText, element.style.fontSize);
             return true;

package/src/plugins/submenu/list.js

@@ -65,11 +65,7 @@ export default {
         const icon = button.firstElementChild;
         const util = this.util;
 
-        if (!element) {
-            button.removeAttribute('data-focus');
-            util.changeElement(icon, this.context.list.icons.number);
-            util.removeClass(button, 'active');
-        } else if (util.isList(element)) {
+        if (util.isList(element)) {
             const nodeName = element.nodeName;
             button.setAttribute('data-focus', nodeName);
             util.addClass(button, 'active');
@@ -80,6 +76,10 @@ export default {
             }
             
             return true;
+        } else {
+            button.removeAttribute('data-focus');
+            util.changeElement(icon, this.context.list.icons.number);
+            util.removeClass(button, 'active');
         }
 
         return false;
@@ -234,6 +234,14 @@ export default {
 
                 newCell = util.createElement('LI');
                 util.copyFormatAttributes(newCell, fTag);
+
+                if (i ===  0 && originRange.sc === fTag) {
+                    originRange.sc = newCell;
+                }
+                if (i === len - 1 && originRange.ec === fTag) {
+                    originRange.ec = newCell;
+                }
+
                 if (util.isComponent(fTag)) {
                     const isHR = /^HR$/i.test(fTag.nodeName);
                     if (!isHR) newCell.innerHTML = '<br>';

package/src/plugins/submenu/template.js

@@ -12,7 +12,9 @@ export default {
     display: 'submenu',
     add: function (core, targetElement) {
         const context = core.context;
-        context.template = {};
+        context.template = {
+            selectedIndex: -1
+        };
 
         /** set submenu */
         let templateDiv = this.setSubmenu(core);
@@ -55,7 +57,8 @@ export default {
         e.preventDefault();
         e.stopPropagation();
 
-        const temp = this.options.templates[e.target.getAttribute('data-value')];
+        this.context.template.selectedIndex = e.target.getAttribute('data-value') * 1;
+        const temp = this.options.templates[this.context.template.selectedIndex];
 
         if (temp.html) {
             this.setContents(temp.html);