suneditor 2.41.3 → 2.42.0

package/src/plugins/modules/_anchor.js

@@ -121,12 +121,13 @@ export default {
     on: function (contextAnchor, update) {
         if (!update) {
             this.plugins.anchor.init.call(this, contextAnchor);
-            contextAnchor.anchorText.value = this.getSelection().toString();
+            contextAnchor.anchorText.value = this.getSelection().toString().trim();
+            contextAnchor.newWindowCheck.checked = this.options.linkTargetNewWindow;
         } else if (contextAnchor.linkAnchor) {
             this.context.dialog.updateModal = true;
-            const href = contextAnchor.linkAnchor.href;
+            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.anchorText.value = contextAnchor.linkAnchor.textContent.trim() || contextAnchor.linkAnchor.getAttribute('alt');
+            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;
         }
@@ -293,9 +294,10 @@ export default {
     setLinkPreview: function (context, value) {
         const preview = context.preview;
         const protocol = this.options.linkProtocol;
+        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 ? '' : (protocol && !reservedProtocol && !sameProtocol) ? protocol + value : reservedProtocol ? value : /^www\./.test(value) ? 'http://' + value : this.context.anchor.host + (/^\//.test(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) {
             context.bookmark.style.display = 'block';

package/src/plugins/modules/component.d.ts

@@ -22,4 +22,4 @@ declare interface component extends Module {
     create_caption(): string;
 }
 
-export default resizing;
+export default component;

package/src/plugins/modules/fileBrowser.js

@@ -229,7 +229,12 @@
                 this.plugins.fileBrowser._xmlHttp = null;
                 if (xmlHttp.status === 200) {
                     try {
-                        this.plugins.fileBrowser._drawListItem.call(this, JSON.parse(xmlHttp.responseText).result, true);
+                        const res = JSON.parse(xmlHttp.responseText);
+                        if (res.result.length > 0) {
+                            this.plugins.fileBrowser._drawListItem.call(this, res.result, true);
+                        } else if (res.nullMessage) {
+                            this.context.fileBrowser.list.innerHTML = res.nullMessage;
+                        }
                     } catch (e) {
                         throw Error('[SUNEDITOR.fileBrowser.drawList.fail] cause : "' + e.message + '"');
                     } finally {

package/src/plugins/modules/fileManager.js

@@ -28,8 +28,6 @@
         _checkMediaComponent: function (tag) {
             if (/IMG/i.test(tag)) {
                 return !/FIGURE/i.test(tag.parentElement.nodeName) || !/FIGURE/i.test(tag.parentElement.parentElement.nodeName);
-            } else if (/VIDEO/i.test(tag)) {
-                return !/FIGURE/i.test(tag.parentElement.nodeName);
             }
             return true;
         },
@@ -98,7 +96,7 @@
         checkInfo: function (pluginName, tagNames, uploadEventHandler, modifyHandler, resizing) {
             let tags = [];
             for (let i = 0, len = tagNames.length; i < len; i++) {
-                tags = tags.concat([].slice.call(this.context.element.wysiwyg.getElementsByTagName(tagNames[i])));
+                tags = tags.concat([].slice.call(this.context.element.wysiwyg.querySelectorAll(tagNames[i] + ':not([data-se-embed="true"])')));
             }
 
             const fileManagerPlugin = this.plugins.fileManager;

package/src/plugins/modules/resizing.js

@@ -437,11 +437,16 @@
             }
     
             // align icon
-            const alignList = contextResizing.alignMenuList;
-            this.util.changeElement(contextResizing.alignButton.firstElementChild, contextResizing.alignIcons[align]);
-            for (let i = 0, len = alignList.length; i < len; i++) {
-                if (alignList[i].getAttribute('data-value') === align) this.util.addClass(alignList[i], 'on');
-                else this.util.removeClass(alignList[i], 'on');
+            if (contextPlugin._alignHide) {
+                contextResizing.alignButton.style.display = 'none';
+            } else {
+                contextResizing.alignButton.style.display = '';
+                const alignList = contextResizing.alignMenuList;
+                this.util.changeElement(contextResizing.alignButton.firstElementChild, contextResizing.alignIcons[align]);
+                for (let i = 0, len = alignList.length; i < len; i++) {
+                    if (alignList[i].getAttribute('data-value') === align) this.util.addClass(alignList[i], 'on');
+                    else this.util.removeClass(alignList[i], 'on');
+                }
             }
     
             // percentage active
@@ -478,7 +483,7 @@
             }
 
             this.setControllerPosition(contextResizing.resizeButton, resizeContainer, 'bottom', addOffset);
-            this.controllersOn(resizeContainer, contextResizing.resizeButton, this.util.setDisabledButtons.bind(this, false, this.resizingDisabledButtons), targetElement, plugin);
+            this.controllersOn(resizeContainer, contextResizing.resizeButton, this.util.setDisabledButtons.bind(this.util, false, this.resizingDisabledButtons), targetElement, plugin);
             this.util.setDisabledButtons(true, this.resizingDisabledButtons);
     
             contextResizing._resize_w = w;

package/src/plugins/submenu/align.js

@@ -15,9 +15,10 @@ export default {
         const context = core.context;
         context.align = {
             targetButton: targetElement,
+            _itemMenu: null,
             _alignList: null,
             currentAlign: '',
-            defaultDir: core.options.rtl ? 'right' : 'left', 
+            defaultDir: core.options.rtl ? 'right' : 'left',
             icons: {
                 justify: icons.align_justify,
                 left: icons.align_left,
@@ -28,7 +29,7 @@ export default {
 
         /** set submenu */
         let listDiv = this.setSubmenu(core);
-        let listUl = listDiv.querySelector('ul');
+        let listUl = context.align._itemMenu = listDiv.querySelector('ul');
 
         /** add event listeners */
         listUl.addEventListener('click', this.pickup.bind(core));
@@ -45,36 +46,24 @@ export default {
         const lang = core.lang;
         const icons = core.icons;
         const listDiv = core.util.createElement('DIV');
-        const leftDir = core.context.align.defaultDir === 'left';
-
-        const leftMenu = '<li>' +
-            '<button type="button" class="se-btn-list se-btn-align" data-command="justifyleft" data-value="left" title="' + lang.toolbar.alignLeft + '">' +
-                '<span class="se-list-icon">' + icons.align_left + '</span>' + lang.toolbar.alignLeft +
-            '</button>' +
-        '</li>';
-
-        const rightMenu = '<li>' +
-            '<button type="button" class="se-btn-list se-btn-align" data-command="justifyright" data-value="right" title="' + lang.toolbar.alignRight + '">' +
-                '<span class="se-list-icon">' + icons.align_right +'</span>' + lang.toolbar.alignRight +
-            '</button>' +
-        '</li>';
+        const alignItems = core.options.alignItems;
+
+        let html = '';
+        for (let i = 0, item, text; i < alignItems.length; i++) {
+            item = alignItems[i];
+            text = lang.toolbar['align' + item.charAt(0).toUpperCase() + item.slice(1)];
+            html += '<li>' +
+                '<button type="button" class="se-btn-list se-btn-align" data-value="' + item + '" title="' + text + '">' +
+                    '<span class="se-list-icon">' + icons['align_' + item] + '</span>' + text +
+                '</button>' +
+            '</li>';
+        }
 
         listDiv.className = 'se-submenu se-list-layer se-list-align';
         listDiv.innerHTML = '' +
             '<div class="se-list-inner">' +
                 '<ul class="se-list-basic">' +
-                    (leftDir ? leftMenu : rightMenu) +
-                    '<li>' +
-                        '<button type="button" class="se-btn-list se-btn-align" data-command="justifycenter" data-value="center" title="' + lang.toolbar.alignCenter + '">' +
-                            '<span class="se-list-icon">' + icons.align_center + '</span>' + lang.toolbar.alignCenter +
-                        '</button>' +
-                    '</li>' +
-                    (leftDir? rightMenu : leftMenu) +
-                    '<li>' +
-                        '<button type="button" class="se-btn-list se-btn-align" data-command="justifyfull" data-value="justify" title="' + lang.toolbar.alignJustify + '">' +
-                            '<span class="se-list-icon">' + icons.align_justify + '</span>' + lang.toolbar.alignJustify +
-                        '</button>' +
-                    '</li>' +
+                    html +
                 '</ul>' +
             '</div>';
 
@@ -125,6 +114,22 @@ export default {
         }
     },
 
+    exchangeDir: function () {
+        const dir = this.options.rtl ? 'right' : 'left';
+        if (!this.context.align || this.context.align.defaultDir === dir) return;
+
+        this.context.align.defaultDir = dir;
+        let menu = this.context.align._itemMenu;
+        let leftBtn = menu.querySelector('[data-value="left"]');
+        let rightBtn = menu.querySelector('[data-value="right"]');
+        if (leftBtn && rightBtn) {
+            const lp = leftBtn.parentElement;
+            const rp = rightBtn.parentElement;
+            lp.appendChild(rightBtn);
+            rp.appendChild(leftBtn);
+        }
+    },
+
     pickup: function (e) {
         e.preventDefault();
         e.stopPropagation();

package/src/plugins/submenu/font.js

@@ -78,7 +78,7 @@ export default {
         if (!element) {
             const font = this.hasFocus ? this.wwComputedStyle.fontFamily : this.lang.toolbar.font;
             this.util.changeTxt(target, font);
-            this.util.changeTxt(tooltip, this.hasFocus ? this.lang.toolbar.font + ' (' + font + ')' : font);
+            this.util.changeTxt(tooltip, this.hasFocus ? this.lang.toolbar.font + (font ? ' (' + font + ')' : '') : font);
         } else if (element.style && element.style.fontFamily.length > 0) {
             const selectFont = element.style.fontFamily.replace(/["']/g,'');
             this.util.changeTxt(target, selectFont);

package/src/plugins/submenu/horizontalRule.js

@@ -31,26 +31,22 @@ export default {
     setSubmenu: function (core) {
         const lang = core.lang;
         const listDiv = core.util.createElement('DIV');
-
+        const items = core.options.hrItems || [{name: lang.toolbar.hr_solid, class: '__se__solid'}, {name: lang.toolbar.hr_dashed, class: '__se__dashed'}, {name: lang.toolbar.hr_dotted, class: '__se__dotted'}];
+        
+        let list = '';
+        for (let i = 0, len = items.length; i < len; i++) {
+            list += '<li>' +
+                '<button type="button" class="se-btn-list btn_line" data-command="horizontalRule" data-value="' + items[i].class + '" title="' + items[i].name + '">' +
+                    '<hr' + (items[i].class ? ' class="' + items[i].class + '"' : '') + (items[i].style ? ' style="' + items[i].style + '"' : '') + '/>' +
+                '</button>' +
+            '</li>';
+        }
+        
         listDiv.className = 'se-submenu se-list-layer se-list-line';
         listDiv.innerHTML = '' +
             '<div class="se-list-inner">' +
                 '<ul class="se-list-basic">' +
-                    '<li>' +
-                        '<button type="button" class="se-btn-list btn_line" data-command="horizontalRule" data-value="solid" title="' + lang.toolbar.hr_solid + '">' +
-                            '<hr style="border-width: 1px 0 0; border-style: solid none none; border-color: black; border-image: initial; height: 1px;" />' +
-                        '</button>' +
-                    '</li>' +
-                    '<li>' +
-                        '<button type="button" class="se-btn-list btn_line" data-command="horizontalRule" data-value="dotted" title="' + lang.toolbar.hr_dotted + '">' +
-                            '<hr style="border-width: 1px 0 0; border-style: dotted none none; border-color: black; border-image: initial; height: 1px;" />' +
-                        '</button>' +
-                    '</li>' +
-                    '<li>' +
-                        '<button type="button" class="se-btn-list btn_line" data-command="horizontalRule" data-value="dashed" title="' + lang.toolbar.hr_dashed + '">' +
-                            '<hr style="border-width: 1px 0 0; border-style: dashed none none; border-color: black; border-image: initial; height: 1px;" />' +
-                        '</button>' +
-                    '</li>' +
+                    list +
                 '</ul>' +
             '</div>';
 
@@ -74,11 +70,9 @@ export default {
         return false;
     },
 
-    appendHr: function (className) {
-        const oHr = this.util.createElement('HR');
-        oHr.className = className;
+    appendHr: function (hrTemp) {
         this.focus();
-        return this.insertComponent(oHr, false, true, false);
+        return this.insertComponent(hrTemp.cloneNode(false), false, true, false);
     },
 
     horizontalRulePick: function (e) {
@@ -86,16 +80,16 @@ export default {
         e.stopPropagation();
 
         let target = e.target;
-        let value = null;
+        let command = target.getAttribute('data-command');
         
-        while (!value && !/UL/i.test(target.tagName)) {
-            value = target.getAttribute('data-value');
+        while (!command && !/UL/i.test(target.tagName)) {
             target = target.parentNode;
+            command = target.getAttribute('data-command');
         }
 
-        if (!value) return;
+        if (!command) return;
 
-        const oNode = this.plugins.horizontalRule.appendHr.call(this, '__se__' + value);
+        const oNode = this.plugins.horizontalRule.appendHr.call(this, target.firstElementChild);
         if (oNode) {
             this.setRange(oNode, 0, oNode, 0);
             this.submenuOff();