From e4647a353ab304c8c94a772a83ba2f17e56b734b Mon Sep 17 00:00:00 2001
From: JiHong <0125ses@hanmail.net>
Date: Sun, 19 Aug 2018 18:42:33 +0900
Subject: [PATCH] fix: optimization

---
 src/suneditor.js     | 5 +----
 src/suneditor.min.js | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/suneditor.js b/src/suneditor.js
index d692c0049..fb02cbc9f 100644
--- a/src/suneditor.js
+++ b/src/suneditor.js
@@ -1661,10 +1661,7 @@ SUNEDITOR.defaultLang = {
 
                 /** Dialog, Submenu */
                 if (display) {
-                    const prevSubmenu = editor.submenu;
-                    editor.submenuOff();
-
-                    if (/submenu/.test(display) && (target.nextElementSibling === null || target.nextElementSibling !== prevSubmenu)) {
+                    if (/submenu/.test(display) && (target.nextElementSibling === null || target.nextElementSibling !== editor.submenu)) {
                         editor.callModule('submenu', command, target, function () {
                             editor.submenuOn(target);
                         });
diff --git a/src/suneditor.min.js b/src/suneditor.min.js
index 3dc01922c..3acafab64 100644
--- a/src/suneditor.min.js
+++ b/src/suneditor.min.js
@@ -48,8 +48,8 @@ window.open("","_blank");b.mimeType="text/html";b.document.head.innerHTML='<meta
 (k.push("FONT"),g=(c.style.fontFamily||c.face||SUNEDITOR.lang.toolbar.font).replace(/["']/g,""),d.changeTxt(b.commandMap.FONT,g),g=!1,n=n.replace("FONT|",""),r=new RegExp(n,"i"));e&&/^A$/i.test(c.nodeName)&&null===c.getAttribute("data-image-link")?(a.link&&b.controllerArray[0]===a.link.linkBtn||b.callModule("dialog","link",null,function(){SUNEDITOR.plugin.link.call_controller_linkButton.call(b,c)}),e=!1):e&&a.link&&b.controllerArray[0]===a.link.linkBtn&&b.controllersOff();f&&0<c.style.fontSize.length&&
 (d.changeTxt(b.commandMap.SIZE,c.style.fontSize.match(/\d+/)[0]),f=!1,n=n.replace("SIZE|",""),r=new RegExp(n,"i"));l=c.style.cssText;/:\s*bold(?:;|\s)/.test(l)&&k.push("B");/:\s*underline(?:;|\s)/.test(l)&&k.push("U");/:\s*italic(?:;|\s)/.test(l)&&k.push("I");/:\s*line-through(?:;|\s)/.test(l)&&k.push("STRIKE");for(l=0;l<k.length;l++)r.test(k[l])&&(d.addClass(b.commandMap[k[l]],"on"),n=n.replace(k[l]+"|",""),r=new RegExp(n,"i"))}c=c.parentNode}e&&b.controllersOff();n=n.split("|");f=0;for(e=n.length-
 1;f<e;f++)/^FONT/i.test(n[f])?d.changeTxt(b.commandMap[n[f]],SUNEDITOR.lang.toolbar.font):/^SIZE$/i.test(n[f])?d.changeTxt(b.commandMap[n[f]],SUNEDITOR.lang.toolbar.fontSize):d.removeClass(b.commandMap[n[f]],"on")},resize_window:function(){b._variable.isFullScreen&&(b._variable.innerHeight_fullScreen+=window.innerHeight-a.tool.bar.offsetHeight-b._variable.innerHeight_fullScreen,a.element.editorArea.style.height=b._variable.innerHeight_fullScreen+"px")},touchstart_toolbar:function(){b._variable.isTouchMove=
-!1},touchmove_toolbar:function(){b._variable.isTouchMove=!0},onClick_toolbar:function(c){if(b._variable.isTouchMove)return!0;for(var g=c.target,f=g.getAttribute("data-display"),e=g.getAttribute("data-command"),n=g.className;!e&&!/editor_tool/.test(n)&&!/sun-editor-id-toolbar/.test(n);)g=g.parentNode,e=g.getAttribute("data-command"),f=g.getAttribute("data-display"),n=g.className;if(!e&&!f)return!0;c.preventDefault();c.stopPropagation();b.submenuOff();b.focus();if(f)c=b.submenu,b.submenuOff(),!/submenu/.test(f)||
-null!==g.nextElementSibling&&g.nextElementSibling===c?/dialog/.test(f)&&b.callModule("dialog",e,null,function(){SUNEDITOR.plugin.dialog.openDialog.call(b,e,g.getAttribute("data-option"),!1)}):b.callModule("submenu",e,g,function(){b.submenuOn(g)});else if(e)switch(e){case "codeView":b.toggleCodeView();d.toggleClass(g,"on");break;case "fullScreen":b.toggleFullScreen(g);d.toggleClass(g,"on");break;case "indent":case "outdent":b.indent(b._variable.selectionNode,e);break;case "redo":case "undo":case "removeFormat":b.execCommand(e,
+!1},touchmove_toolbar:function(){b._variable.isTouchMove=!0},onClick_toolbar:function(c){if(b._variable.isTouchMove)return!0;for(var g=c.target,f=g.getAttribute("data-display"),e=g.getAttribute("data-command"),n=g.className;!e&&!/editor_tool/.test(n)&&!/sun-editor-id-toolbar/.test(n);)g=g.parentNode,e=g.getAttribute("data-command"),f=g.getAttribute("data-display"),n=g.className;if(!e&&!f)return!0;c.preventDefault();c.stopPropagation();b.submenuOff();b.focus();if(f)!/submenu/.test(f)||null!==g.nextElementSibling&&
+g.nextElementSibling===b.submenu?/dialog/.test(f)&&b.callModule("dialog",e,null,function(){SUNEDITOR.plugin.dialog.openDialog.call(b,e,g.getAttribute("data-option"),!1)}):b.callModule("submenu",e,g,function(){b.submenuOn(g)});else if(e)switch(e){case "codeView":b.toggleCodeView();d.toggleClass(g,"on");break;case "fullScreen":b.toggleFullScreen(g);d.toggleClass(g,"on");break;case "indent":case "outdent":b.indent(b._variable.selectionNode,e);break;case "redo":case "undo":case "removeFormat":b.execCommand(e,
 !1,null);break;case "preview":b.openPreview();break;case "print":a.element.wysiwygWindow.print();break;case "showBlocks":b.toggleDisplayBlocks();d.toggleClass(g,"on");break;default:b.execCommand(e,!1,g.getAttribute("data-value")),d.toggleClass(g,"on"),/^subscript$/.test(e)?SUNEDITOR.dom.removeClass(a.tool.superscript,"on"):/^superscript$/.test(e)&&SUNEDITOR.dom.removeClass(a.tool.subscript,"on")}},onMouseUp_wysiwyg:function(a){a.stopPropagation();var c=a.target;b.submenuOff();/^HTML$/i.test(c.nodeName)?
 (a.preventDefault(),b.focus()):/^IMG$/i.test(c.nodeName)?(a.preventDefault(),b.callModule("dialog","image",null,function(){var a=SUNEDITOR.plugin.dialog.call_controller_resize.call(b,c,"image");SUNEDITOR.plugin.image.onModifyMode.call(b,c,a)})):(b._setSelectionNode(),f._findButtonEffectTag())},onKeyDown_wysiwyg:function(c){b._setSelectionNode();var g=c.keyCode,e=c.shiftKey,u=c.ctrlKey||c.metaKey,n=c.altKey;c.stopPropagation();if(u&&!/^(?:16|17|18)$/.test(g)){var r;if(r=!(e&&83!==g))(r=f._shortcutKeyCode[g])?
 (b.execCommand(r[0],!1,null),d.toggleClass(b.commandMap[r[1]],"on"),r=!0):r=!1;if(r){c.preventDefault();return}}switch(g){case 8:if(/^P$/i.test(b._variable.selectionNode.tagName)&&null===b._variable.selectionNode.previousSibling)return c.preventDefault(),!1;break;case 9:if(c.preventDefault(),!u&&!n){for(c=b._variable.selectionNode||b.getSelection().anchorNode;!/^TD$/i.test(c.tagName)&&!/^BODY$/i.test(c.tagName);)c=c.parentNode;if(c&&/^TD$/i.test(c.tagName)){g=d.getParentNode(c,"table");g=d.getListChildren(g,