ueditor-plus-assets 0.0.12 → 0.0.13

package/dist/UEditorPlus/ueditor.all.js

@@ -1,9 +1,9 @@
-/*!
- * UEditorPlus
- * version: 2.0.0
-*/
-(function(){
-
+/*!
+ * UEditorPlus
+ * version: 2.0.0
+*/
+(function(){
+
 // editor.js
 UEDITOR_CONFIG = window.UEDITOR_CONFIG || {};
 
@@ -40,7 +40,7 @@ window.UE = baidu.editor = {
 };
 var dom = (UE.dom = {});
 
-
+
 // core/browser.js
 /**
  * 浏览器判断模块
@@ -306,7 +306,7 @@ var ie = browser.ie,
     gecko = browser.gecko,
     opera = browser.opera;
 
-
+
 // core/utils.js
 /**
  * 工具函数包
@@ -1605,7 +1605,7 @@ utils.each(
     }
 );
 
-
+
 // core/EventBase.js
 /**
  * UE采用的事件基类
@@ -1780,7 +1780,7 @@ function getListener(obj, type, force) {
     );
 }
 
-
+
 // core/dtd.js
 ///import editor.js
 ///import core/dom/dom.js
@@ -2218,7 +2218,7 @@ var dtd = (dom.dtd = (function () {
     });
 })());
 
-
+
 // core/domUtils.js
 /**
  * Dom操作工具包
@@ -4797,7 +4797,7 @@ var domUtils = (dom.domUtils = {
 });
 var fillCharReg = new RegExp(domUtils.fillChar, "g");
 
-
+
 // core/Range.js
 /**
  * Range封装
@@ -6795,7 +6795,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, "g");
     };
 })();
 
-
+
 // core/Selection.js
 /**
  * 选集
@@ -7217,7 +7217,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, "g");
     };
 })();
 
-
+
 // core/Editor.js
 /**
  * 编辑器主类，包含编辑器提供的大部分公用接口
@@ -7484,7 +7484,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, "g");
                         me.options.lang +
                         "/" +
                         me.options.lang +
-                        ".js?{timestamp:dist/lang/zh-cn/zh-cn.js}",
+                        ".js?58c38108",
                     tag: "script",
                     type: "text/javascript",
                     defer: "defer"
@@ -9019,7 +9019,7 @@ var fillCharReg = new RegExp(domUtils.fillChar, "g");
     utils.inherits(Editor, EventBase);
 })();
 
-
+
 // core/Editor.defaultoptions.js
 //维护编辑器一下默认的不在插件中的配置项
 UE.Editor.defaultOptions = function (editor) {
@@ -9029,7 +9029,7 @@ UE.Editor.defaultOptions = function (editor) {
         initialContent: "",
         initialStyle: "",
         autoClearinitialContent: false,
-        iframeCssUrl: _url + "themes/iframe.css?{timestamp}",
+        iframeCssUrl: _url + "themes/iframe.css?c20ec247",
         iframeCssUrlsAddition: [],
         textarea: '',
         focus: false,
@@ -9053,7 +9053,7 @@ UE.Editor.defaultOptions = function (editor) {
     };
 };
 
-
+
 // core/loadconfig.js
 (function () {
     UE.Editor.prototype.loadServerConfig = function () {
@@ -9140,7 +9140,7 @@ UE.Editor.defaultOptions = function (editor) {
     };
 })();
 
-
+
 // core/ajax.js
 /**
  * @file
@@ -9435,7 +9435,7 @@ UE.ajax = (function () {
     };
 })();
 
-
+
 // core/api.js
 UE.api = (function () {
     // axios import
@@ -10658,7 +10658,7 @@ UE.api = (function () {
     }
 })();
 
-
+
 // core/image.js
 UE.image = (function () {
     // import browser-image-compression
@@ -12659,7 +12659,7 @@ UE.image = (function () {
     };
 })();
 
-
+
 // core/dialog.js
 UE.dialog = (function () {
     return {
@@ -12693,7 +12693,7 @@ UE.dialog = (function () {
     }
 })();
 
-
+
 // core/filterword.js
 /**
  * UE过滤word的静态方法
@@ -12923,7 +12923,7 @@ var filterWord = (UE.filterWord = (function () {
     };
 })());
 
-
+
 // core/node.js
 /**
  * 编辑器模拟的节点类
@@ -13701,7 +13701,7 @@ var filterWord = (UE.filterWord = (function () {
     };
 })();
 
-
+
 // core/htmlparser.js
 /**
  * html字符串转换成uNode节点
@@ -13954,7 +13954,7 @@ var htmlparser = (UE.htmlparser = function (htmlstr, ignoreBlank) {
     return root;
 });
 
-
+
 // core/filternode.js
 /**
  * UE过滤节点的静态方法
@@ -14084,7 +14084,7 @@ var filterNode = (UE.filterNode = (function () {
     };
 })());
 
-
+
 // core/plugin.js
 /**
  * Created with JetBrains PhpStorm.
@@ -14166,7 +14166,7 @@ UE.plugin = (function () {
     };
 })();
 
-
+
 // core/keymap.js
 var keymap = (UE.keymap = {
     Backspace: 8,
@@ -14217,7 +14217,7 @@ var keymap = (UE.keymap = {
     n: 78
 });
 
-
+
 // core/localstorage.js
 var LocalStorage = (UE.LocalStorage = (function () {
 
@@ -14229,8 +14229,12 @@ var LocalStorage = (UE.LocalStorage = (function () {
             if (!storage) {
                 return false;
             }
-            storage.setItem(key, data);
-            return true;
+            try {
+                storage.setItem(key, data);
+                return true;
+            } catch (error) {
+                return false;
+            }
         },
         getLocalData: function (key) {
             // console.log('getLocalData', key);
@@ -14265,7 +14269,13 @@ var LocalStorage = (UE.LocalStorage = (function () {
         } else {
             data = obj;
         }
-        data && LocalStorage.saveLocalData(ROOT_KEY, utils.json2str(data));
+        if (data) {
+            var serialized = utils.json2str(data);
+            if (!LocalStorage.saveLocalData(ROOT_KEY, serialized) && utils.isString(key)) {
+                delete data[key];
+                LocalStorage.saveLocalData(ROOT_KEY, utils.json2str(data));
+            }
+        }
     };
 
     UE.Editor.prototype.getPreferences = function (key) {
@@ -14288,7 +14298,7 @@ var LocalStorage = (UE.LocalStorage = (function () {
     };
 })();
 
-
+
 // plugins/defaultfilter.js
 ///import core
 ///plugin 编辑器默认的过滤转换机制
@@ -14569,7 +14579,7 @@ UE.plugins["defaultfilter"] = function () {
     });
 };
 
-
+
 // plugins/inserthtml.js
 /**
  * 插入html字符串插件
@@ -14849,7 +14859,7 @@ UE.commands["inserthtml"] = {
     }
 };
 
-
+
 // plugins/autotypeset.js
 /**
  * 自动排版
@@ -15223,7 +15233,7 @@ UE.plugins["autotypeset"] = function () {
     };
 };
 
-
+
 // plugins/autosubmit.js
 /**
  * 快捷键提交
@@ -15265,7 +15275,7 @@ UE.plugin.register("autosubmit", function () {
     };
 });
 
-
+
 // plugins/background.js
 /**
  * 背景插件，为UEditor提供设置背景功能
@@ -15399,7 +15409,7 @@ UE.plugin.register("background", function () {
     };
 });
 
-
+
 // plugins/image.js
 /**
  * 图片插入、排版插件
@@ -15705,7 +15715,7 @@ UE.commands["insertimage"] = {
     }
 };
 
-
+
 // plugins/justify.js
 /**
  * 段落格式
@@ -15839,7 +15849,7 @@ UE.plugins["justify"] = function () {
     };
 };
 
-
+
 // plugins/font.js
 /**
  * 字体颜色,背景色,字号,字体,下划线,删除线
@@ -16421,7 +16431,7 @@ UE.plugins["font"] = function () {
     }
 };
 
-
+
 // plugins/link.js
 /**
  * 超链接
@@ -16620,7 +16630,7 @@ UE.plugins["link"] = function () {
     };
 };
 
-
+
 // plugins/iframe.js
 ///import core
 ///import plugins\inserthtml.js
@@ -16641,7 +16651,7 @@ UE.plugins["insertframe"] = function () {
     });
 };
 
-
+
 // plugins/scrawl.js
 ///import core
 ///commands 涂鸦
@@ -16654,7 +16664,7 @@ UE.commands["scrawl"] = {
     }
 };
 
-
+
 // plugins/removeformat.js
 /**
  * 清除格式
@@ -16868,7 +16878,7 @@ UE.plugins["removeformat"] = function () {
     };
 };
 
-
+
 // plugins/blockquote.js
 /**
  * 添加引用
@@ -17061,7 +17071,7 @@ UE.plugins["blockquote"] = function () {
     };
 };
 
-
+
 // plugins/convertcase.js
 /**
  * 大小写转换
@@ -17121,7 +17131,7 @@ UE.commands["touppercase"] = UE.commands["tolowercase"] = {
     }
 };
 
-
+
 // plugins/indent.js
 /**
  * 首行缩进
@@ -17167,7 +17177,7 @@ UE.commands["indent"] = {
     }
 };
 
-
+
 // plugins/print.js
 /**
  * 打印
@@ -17192,7 +17202,7 @@ UE.commands["print"] = {
     notNeedUndo: 1
 };
 
-
+
 // plugins/preview.js
 /**
  * 预览
@@ -17231,7 +17241,7 @@ UE.commands["preview"] = {
     notNeedUndo: 1
 };
 
-
+
 // plugins/selectall.js
 /**
  * 全选
@@ -17276,7 +17286,7 @@ UE.plugins["selectall"] = function () {
     });
 };
 
-
+
 // plugins/paragraph.js
 /**
  * 段落样式
@@ -17497,7 +17507,7 @@ UE.plugins["paragraph"] = function () {
     };
 };
 
-
+
 // plugins/directionality.js
 /**
  * 设置文字输入的方向的插件
@@ -17632,7 +17642,7 @@ UE.plugins["paragraph"] = function () {
     };
 })();
 
-
+
 // plugins/horizontal.js
 /**
  * 插入分割线插件
@@ -17737,7 +17747,7 @@ UE.plugins["horizontal"] = function () {
     });
 };
 
-
+
 // plugins/time.js
 /**
  * 插入时间和日期
@@ -17798,7 +17808,7 @@ UE.commands["time"] = UE.commands["date"] = {
     }
 };
 
-
+
 // plugins/rowspacing.js
 /**
  * 段前段后间距插件
@@ -17852,7 +17862,7 @@ UE.plugins["rowspacing"] = function () {
     };
 };
 
-
+
 // plugins/lineheight.js
 /**
  * 设置行内间距
@@ -17908,7 +17918,7 @@ UE.plugins["lineheight"] = function () {
     };
 };
 
-
+
 // plugins/insertcode.js
 /**
  * 插入代码插件
@@ -17918,32 +17928,253 @@ UE.plugins["lineheight"] = function () {
 
 UE.plugins["insertcode"] = function () {
     var me = this;
+    function getStoredCodeBlockLanguage(node) {
+        return normalizeInsertCodeLanguage(getNodeAttr(node, "data-code-lang"));
+    }
+    function normalizeInsertCodeLanguage(lang) {
+        if (!lang) return "";
+        lang = (lang + "").toLowerCase();
+        var aliasMap = {
+            javascript: "js",
+            jscript: "js",
+            shell: "bash",
+            sh: "bash",
+            powershell: "ps",
+            csharp: "c#",
+            plaintext: "plain",
+            text: "plain",
+            txt: "plain"
+        };
+        return aliasMap[lang] || lang;
+    }
+    function getCodeBlockLanguage(node) {
+        if (!node) return "";
+        var storedLang = getStoredCodeBlockLanguage(node);
+        if (storedLang) {
+            return storedLang;
+        }
+        var className = "";
+        if (node.getAttr) {
+            className = node.getAttr("class") || "";
+        } else {
+            className = node.className || "";
+        }
+        var match = className.match(/(?:^|\s)language-([^\s]+)/);
+        if (match && match[1]) {
+            return normalizeInsertCodeLanguage(match[1]);
+        }
+        match = className.match(/brush:([^;]+)/);
+        return match && match[1] ? normalizeInsertCodeLanguage(match[1]) : "";
+    }
+    function getCodePlainText(node) {
+        if (!node) return "";
+        var text = "";
+        if (typeof node.innerText == "function") {
+            text = node.innerText() || "";
+        } else if (typeof node.innerText == "string") {
+            text = node.innerText;
+        } else if (typeof node.textContent == "string") {
+            text = node.textContent;
+        } else if (node.nodeType == 3) {
+            text = node.nodeValue || "";
+        }
+        return (text || "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+    }
+    function decodeSlateFragmentLanguage(node, expectedText) {
+        if (!node) return "";
+        var fragment = getNodeAttr(node, "data-slate-fragment");
+        if (!fragment || typeof window === "undefined" || !window.atob) {
+            return "";
+        }
+        try {
+            var decoded = decodeURIComponent(window.atob(fragment));
+            var json = JSON.parse(decoded);
+            if (!utils.isArray(json)) {
+                json = [json];
+            }
+            var found = [];
+            var walk = function (items) {
+                if (!items) return;
+                utils.each(items, function (item) {
+                    if (!item) return;
+                    if (item.type == "code" && item.language) {
+                        var text = "";
+                        utils.each(item.children || [], function (child) {
+                            if (child && typeof child.text == "string") {
+                                text += child.text;
+                            }
+                        });
+                        found.push({
+                            language: item.language,
+                            text: text.replace(/\r\n/g, "\n").replace(/\r/g, "\n")
+                        });
+                    }
+                    if (item.children && item.children.length) {
+                        walk(item.children);
+                    }
+                });
+            };
+            walk(json);
+            if (!found.length) {
+                return "";
+            }
+            var normalizedExpected = (expectedText || "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+            if (normalizedExpected) {
+                var matched = "";
+                utils.each(found, function (item) {
+                    if (item.text == normalizedExpected) {
+                        matched = normalizeInsertCodeLanguage(item.language);
+                        return false;
+                    }
+                });
+                if (matched) {
+                    return matched;
+                }
+            }
+            return found.length == 1
+                ? normalizeInsertCodeLanguage(found[0].language)
+                : "";
+        } catch (error) {
+            return "";
+        }
+    }
+    function getCodeChild(node) {
+        if (!node) return null;
+        if (node.getElementsByTagName) {
+            var codeNodes = node.getElementsByTagName("code");
+            return codeNodes && codeNodes[0] ? codeNodes[0] : null;
+        }
+        var codeNode = null;
+        utils.each(node.children || [], function (child) {
+            if (child.type == "element" && child.tagName == "code") {
+                codeNode = child;
+                return false;
+            }
+        });
+        return codeNode;
+    }
+    function setEditableCodeBlockLanguage(pre, lang) {
+        lang = normalizeInsertCodeLanguage(lang);
+        var className = lang ? "language-" + lang : "";
+        var codeNode = getCodeChild(pre);
+        if (codeNode) {
+            codeNode.className = className;
+            if (codeNode.setAttribute) {
+                codeNode.setAttribute("data-code-lang", lang || "");
+            } else if (codeNode.setAttr) {
+                codeNode.setAttr("data-code-lang", lang || "");
+            }
+            if (pre.setAttribute) {
+                pre.setAttribute("class", className);
+            } else {
+                pre.className = className;
+            }
+            pre.setAttribute && pre.setAttribute("data-code-lang", lang || "");
+            pre.setAttr && pre.setAttr("data-code-lang", lang || "");
+        } else {
+            pre.className = className;
+            pre.setAttribute && pre.setAttribute("data-code-lang", lang || "");
+            pre.setAttr && pre.setAttr("data-code-lang", lang || "");
+        }
+    }
+    function getNodeAttr(node, attrName) {
+        if (!node) return "";
+        if (node.getAttr) {
+            return node.getAttr(attrName) || "";
+        }
+        return node.getAttribute ? node.getAttribute(attrName) || "" : "";
+    }
+    function ensureSlateCodeLineBreakText(node) {
+        if (!node) return;
+        utils.each(node.children || [], function (child) {
+            if (!child || child.type != "element") return;
+            ensureSlateCodeLineBreakText(child);
+            if (getNodeAttr(child, "data-slate-string") === "") {
+                return;
+            }
+            var hasChildContent = false;
+            utils.each(child.children || [], function (grandChild) {
+                if (!grandChild) return;
+                if (grandChild.type == "element") {
+                    hasChildContent = true;
+                    return false;
+                }
+                if (grandChild.type == "text" && grandChild.data !== "") {
+                    hasChildContent = true;
+                    return false;
+                }
+            });
+            if (!hasChildContent) {
+                child.appendChild(UE.uNode.createText("\n"));
+            }
+        });
+    }
+    function removeRuntimeAttrs(node) {
+        if (!node) return;
+        var removeAttr = function (target, attrName) {
+            if (!target) return;
+            if (target.getAttr) {
+                target.setAttr(attrName);
+            } else if (target.removeAttribute) {
+                target.removeAttribute(attrName);
+            }
+        };
+        if (node.getAttr) {
+            utils.each(node.attrs || {}, function (val, key) {
+                if (
+                    /^data-w-e-/.test(key) ||
+                    key == "data-slate-fragment"
+                ) {
+                    removeAttr(node, key);
+                }
+            });
+            var currentId = node.getAttr("id");
+            if (currentId && /^w-e-/.test(currentId)) {
+                removeAttr(node, "id");
+            }
+        } else if (node.attributes) {
+            var attrs = [];
+            utils.each(node.attributes, function (attr) {
+                if (attr && attr.name) {
+                    attrs.push(attr.name);
+                }
+            });
+            utils.each(attrs, function (attrName) {
+                if (
+                    /^data-w-e-/.test(attrName) ||
+                    attrName == "data-slate-fragment"
+                ) {
+                    removeAttr(node, attrName);
+                }
+            });
+            if (node.id && /^w-e-/.test(node.id)) {
+                removeAttr(node, "id");
+            }
+        }
+        utils.each(node.children || [], function (child) {
+            if (child.type == "element" || child.nodeType == 1) {
+                removeRuntimeAttrs(child);
+            }
+        });
+    }
     me.setOpt("insertcode", {
-        as3: "ActionScript3",
-        bash: "Bash/Shell",
-        cpp: "C/C++",
-        css: "Css",
-        // cf: "CodeFunction",
-        "c#": "C#",
-        delphi: "Delphi",
-        // diff: "Diff",
-        erlang: "Erlang",
-        groovy: "Groovy",
-        html: "Html",
+        css: "CSS",
+        html: "HTML",
+        xml: "XML",
+        js: "JavaScript",
+        typescript: "TypeScript",
+        python: "Python",
         java: "Java",
-        // jfx: "JavaFx",
-        js: "Javascript",
-        pl: "Perl",
+        go: "Go",
+        rust: "Rust",
         php: "PHP",
-        plain: "Text",
-        ps: "PowerShell",
-        python: "Python",
-        ruby: "Ruby",
-        scala: "Scala",
+        cpp: "C++",
+        "c#": "C#",
+        bash: "Shell",
+        nginx: "Nginx",
         sql: "SQL",
-        vb: "VB",
-        xml: "XML",
-        mind: "Mind",
+        json: "JSON",
+        markdown: "Markdown"
     });
 
     /**
@@ -17976,7 +18207,7 @@ UE.plugins["insertcode"] = function () {
                 rng = me.selection.getRange(),
                 pre = domUtils.findParentByTagName(rng.startContainer, "pre", true);
             if (pre) {
-                pre.className = "brush:" + lang + ";toolbar:false;";
+                setEditableCodeBlockLanguage(pre, lang);
             } else {
                 var code = "";
                 if (rng.collapsed) {
@@ -18062,9 +18293,9 @@ UE.plugins["insertcode"] = function () {
                 }
                 me.execCommand(
                     "inserthtml",
-                    '<pre id="coder"class="brush:' +
+                    '<pre id="coder" class="language-' +
                     lang +
-                    ';toolbar:false">' +
+                    '">' +
                     code +
                     "</pre>",
                     true
@@ -18093,12 +18324,41 @@ UE.plugins["insertcode"] = function () {
             }
         },
         queryCommandValue: function () {
+            var range = this.selection.getRange();
+            var startContainer = range && range.startContainer;
+            var codeElement = domUtils.findParentByTagName(startContainer, "code", true);
+            var preElement = domUtils.findParentByTagName(startContainer, "pre", true);
+            var directLang =
+                getCodeBlockLanguage(codeElement) ||
+                getCodeBlockLanguage(getCodeChild(preElement)) ||
+                getCodeBlockLanguage(preElement) ||
+                decodeSlateFragmentLanguage(
+                    preElement,
+                    getCodePlainText(codeElement || preElement)
+                ) ||
+                decodeSlateFragmentLanguage(codeElement, getCodePlainText(codeElement));
+            if (directLang) {
+                return directLang;
+            }
             var path = this.selection.getStartElementPath();
             var lang = "";
             utils.each(path, function (node) {
+                if (node.nodeName == "CODE") {
+                    lang = getCodeBlockLanguage(node);
+                    if (!lang) {
+                        lang = decodeSlateFragmentLanguage(node, getCodePlainText(node));
+                    }
+                    if (lang) {
+                        return false;
+                    }
+                }
                 if (node.nodeName == "PRE") {
-                    var match = node.className.match(/brush:([^;]+)/);
-                    lang = match && match[1] ? match[1] : "";
+                    var codeNode = getCodeChild(node);
+                    lang =
+                        getCodeBlockLanguage(codeNode) ||
+                        getCodeBlockLanguage(node) ||
+                        decodeSlateFragmentLanguage(node, getCodePlainText(codeNode || node)) ||
+                        decodeSlateFragmentLanguage(codeNode, getCodePlainText(codeNode));
                     return false;
                 }
             });
@@ -18108,6 +18368,28 @@ UE.plugins["insertcode"] = function () {
 
     me.addInputRule(function (root) {
         utils.each(root.getNodesByTagName("pre"), function (pre) {
+            var codeNode = getCodeChild(pre);
+            var codeText = getCodePlainText(codeNode || pre);
+            var lang =
+                getCodeBlockLanguage(codeNode) ||
+                getCodeBlockLanguage(pre) ||
+                decodeSlateFragmentLanguage(pre, codeText) ||
+                decodeSlateFragmentLanguage(codeNode, codeText);
+            if (codeNode) {
+                ensureSlateCodeLineBreakText(codeNode);
+                removeRuntimeAttrs(pre);
+                if (lang && !getStoredCodeBlockLanguage(codeNode)) {
+                    codeNode.setAttr("class", "language-" + lang);
+                }
+                if (lang) {
+                    codeNode.setAttr("data-code-lang", lang);
+                    pre.setAttr("data-code-lang", lang);
+                    pre.setAttr("class", "language-" + lang);
+                } else {
+                    pre.setAttr("class");
+                }
+                return;
+            }
             var brs = pre.getNodesByTagName("br");
             if (brs.length) {
                 browser.ie &&
@@ -18133,6 +18415,29 @@ UE.plugins["insertcode"] = function () {
     });
     me.addOutputRule(function (root) {
         utils.each(root.getNodesByTagName("pre"), function (pre) {
+            var outputCodeNode = getCodeChild(pre);
+            var outputCodeText = getCodePlainText(outputCodeNode || pre);
+            var lang =
+                getCodeBlockLanguage(outputCodeNode) ||
+                getCodeBlockLanguage(pre) ||
+                decodeSlateFragmentLanguage(pre, outputCodeText) ||
+                decodeSlateFragmentLanguage(outputCodeNode, outputCodeText);
+            var existingCodeNode = outputCodeNode;
+            if (existingCodeNode) {
+                ensureSlateCodeLineBreakText(existingCodeNode);
+                removeRuntimeAttrs(pre);
+                if (lang && !getStoredCodeBlockLanguage(existingCodeNode)) {
+                    existingCodeNode.setAttr("class", "language-" + lang);
+                }
+                if (lang) {
+                    existingCodeNode.setAttr("data-code-lang", lang);
+                    pre.setAttr("data-code-lang", lang);
+                    pre.setAttr("class", "language-" + lang);
+                } else {
+                    pre.setAttr("class");
+                }
+                return;
+            }
             var code = "";
             utils.each(pre.children, function (n) {
                 if (n.type == "text") {
@@ -18148,7 +18453,16 @@ UE.plugins["insertcode"] = function () {
                 }
             });
 
-            pre.innerText(code.replace(/(&nbsp;|\n)+$/, ""));
+            var codeNode = UE.uNode.createElement("code");
+            if (lang) {
+                codeNode.setAttr("class", "language-" + lang);
+                codeNode.setAttr("data-code-lang", lang);
+                pre.setAttr("data-code-lang", lang);
+            }
+            codeNode.innerText(code.replace(/(&nbsp;|\n)+$/, ""));
+            pre.innerHTML("");
+            pre.setAttr("class");
+            pre.appendChild(codeNode);
         });
     });
     //不需要判断highlight的command列表
@@ -18517,7 +18831,7 @@ UE.plugins["insertcode"] = function () {
     });
 };
 
-
+
 // plugins/cleardoc.js
 /**
  * 清空文档插件
@@ -18555,7 +18869,7 @@ UE.commands["cleardoc"] = {
     }
 };
 
-
+
 // plugins/anchor.js
 /**
  * 锚点插件，为UEditor提供插入锚点支持
@@ -18653,7 +18967,7 @@ UE.plugin.register("anchor", function () {
     };
 });
 
-
+
 // plugins/wordcount.js
 ///import core
 ///commands 字数统计
@@ -18697,7 +19011,7 @@ UE.plugins["wordcount"] = function () {
     });
 };
 
-
+
 // plugins/pagebreak.js
 /**
  * 分页功能插件
@@ -18880,7 +19194,7 @@ UE.plugins["pagebreak"] = function () {
     };
 };
 
-
+
 // plugins/wordimage.js
 ///import core
 ///commands 本地图片引导上传
@@ -18949,7 +19263,7 @@ UE.plugin.register("wordimage", function () {
     };
 });
 
-
+
 // plugins/autosave.js
 UE.plugin.register("autosave", function () {
     var me = this, saveKey = null;
@@ -19086,7 +19400,7 @@ UE.plugin.register("autosave", function () {
     };
 });
 
-
+
 // plugins/formula.js
 UE.plugin.register("formula", function () {
     var me = this, images = [];
@@ -19113,7 +19427,7 @@ UE.plugin.register("formula", function () {
     };
 });
 
-
+
 // plugins/dragdrop.js
 UE.plugins["dragdrop"] = function () {
     var me = this;
@@ -19181,7 +19495,7 @@ UE.plugins["dragdrop"] = function () {
     });
 };
 
-
+
 // plugins/undo.js
 /**
  * undo redo
@@ -19525,10 +19839,148 @@ UE.plugins["undo"] = function () {
     };
 };
 
-
+
 // plugins/copy.js
 UE.plugin.register("copy", function () {
     var me = this;
+    function normalizeCopiedCodeBlocks(container) {
+        if (!container || !container.getElementsByTagName) return;
+        var codeBlocks = container.getElementsByTagName("code");
+        function getCodeText(node) {
+            if (!node) return "";
+            if (node.nodeType == 3) {
+                return node.nodeValue || "";
+            }
+            if (node.nodeType != 1) {
+                return "";
+            }
+            if (node.tagName == "BR") {
+                return "\n";
+            }
+            var text = "";
+            utils.each(node.childNodes || [], function (childNode) {
+                text += getCodeText(childNode);
+            });
+            return text;
+        }
+        utils.each(codeBlocks, function (codeNode) {
+            if (!codeNode) return;
+            var preNode = domUtils.findParentByTagName(codeNode, "pre", true);
+            if (!preNode) return;
+            var dataLang = codeNode.getAttribute("data-code-lang") || preNode.getAttribute("data-code-lang") || "";
+            var className = codeNode.className || preNode.className || "";
+            var match = className.match(/(?:^|\s)language-([^\s]+)/);
+            var lang = dataLang || (match && match[1]) || "";
+            var text = typeof codeNode.textContent == "string"
+                ? codeNode.textContent
+                : getCodeText(codeNode);
+            text = text
+                .replace(/\u00a0/g, " ")
+                .replace(/\r\n/g, "\n")
+                .replace(/\r/g, "\n");
+
+            codeNode.className = lang ? "language-" + lang : "";
+            preNode.className = lang ? "language-" + lang : "";
+
+            if (lang) {
+                codeNode.setAttribute("data-code-lang", lang);
+                preNode.setAttribute("data-code-lang", lang);
+            } else {
+                codeNode.removeAttribute("data-code-lang");
+                preNode.removeAttribute("data-code-lang");
+            }
+            codeNode.setAttribute("data-raw-code", encodeURIComponent(text));
+            preNode.setAttribute("data-raw-code", encodeURIComponent(text));
+        });
+    }
+    function appendStyleText(styleText, stylePart) {
+        styleText = styleText || "";
+        stylePart = stylePart || "";
+        if (!stylePart) return styleText;
+        if (styleText && !/;\s*$/.test(styleText)) {
+            styleText += ";";
+        }
+        return styleText + stylePart;
+    }
+    function replaceCellTag(cell, tagName) {
+        if (!cell || cell.tagName == tagName) return cell;
+        var doc = cell.ownerDocument;
+        var next = doc.createElement(tagName);
+        var attrs = cell.attributes;
+        for (var i = 0; i < attrs.length; i++) {
+            var attr = attrs[i];
+            if (attr && attr.specified !== false) {
+                next.setAttribute(attr.nodeName, attr.nodeValue);
+            }
+        }
+        next.innerHTML = cell.innerHTML;
+        cell.parentNode.replaceChild(next, cell);
+        return next;
+    }
+    function normalizeCopiedTables(container) {
+        if (!container || !container.getElementsByTagName) return;
+        var tables = container.getElementsByTagName("table");
+        utils.each(tables, function (table) {
+            if (!table || !table.rows) return;
+            var tableStyle = table.getAttribute("style") || "";
+            tableStyle = appendStyleText(tableStyle, "border-collapse:collapse;display:table;margin-bottom:10px;");
+            tableStyle = tableStyle.replace(/(?:^|;)\s*height\s*:[^;]*/gi, "");
+            tableStyle = tableStyle.replace(/(?:^|;)\s*background(?:-color)?\s*:[^;]*/gi, "");
+            tableStyle = tableStyle.replace(/(?:^|;)\s*border(?:-(?:top|right|bottom|left))?-(?:width|style|color)\s*:[^;]*/gi, "");
+            tableStyle = tableStyle.replace(/(?:^|;)\s*border\s*:[^;]*/gi, "");
+            table.setAttribute("style", tableStyle);
+
+            var noBorder = domUtils.hasClass(table, "noBorderTable");
+            utils.each(table.rows, function (row, rowIndex) {
+                if (!row || !row.cells) return;
+                var isHeaderRow = rowIndex === 0 || domUtils.hasClass(row, "firstRow");
+                utils.each(row.cells, function (cell) {
+                    if (!cell) return;
+                    var normalizedCell = isHeaderRow ? replaceCellTag(cell, "th") : cell;
+                    var cellStyle = normalizedCell.getAttribute("style") || "";
+                    cellStyle = cellStyle.replace(/(?:^|;)\s*height\s*:[^;]*/gi, "");
+                    cellStyle = cellStyle.replace(/(?:^|;)\s*background(?:-color)?\s*:[^;]*/gi, "");
+                    cellStyle = cellStyle.replace(/(?:^|;)\s*border(?:-(?:top|right|bottom|left))?-(?:width|style|color)\s*:[^;]*/gi, "");
+                    cellStyle = cellStyle.replace(/(?:^|;)\s*border\s*:[^;]*/gi, "");
+                    cellStyle = appendStyleText(cellStyle, noBorder ? "border:1px dashed #ddd;" : "border:1px solid #DDD;");
+                    var align = normalizedCell.getAttribute("align");
+                    if (align && !/text-align\s*:/.test(cellStyle)) {
+                        cellStyle = appendStyleText(cellStyle, "text-align:" + align + ";");
+                    }
+                    normalizedCell.setAttribute("style", cellStyle);
+                    normalizedCell.removeAttribute("class");
+                    normalizedCell.removeAttribute("height");
+                });
+                row.removeAttribute("class");
+            });
+            table.removeAttribute("class");
+        });
+    }
+    function getCopiedHtmlContainer() {
+        var rng = me.selection.getRange(),
+            div = document.createElement("div");
+        div.appendChild(rng.cloneContents());
+        normalizeCopiedTables(div);
+        normalizeCopiedCodeBlocks(div);
+        return div;
+    }
+    function handleNativeCopy(evt) {
+        evt = evt || window.event;
+        var clipboardData =
+            evt.clipboardData ||
+            (evt.originalEvent && evt.originalEvent.clipboardData) ||
+            window.clipboardData;
+        if (!clipboardData) return;
+        var div = getCopiedHtmlContainer();
+        try {
+            if (clipboardData.setData) {
+                clipboardData.setData("text/plain", div.innerText || div.textContent || "");
+                clipboardData.setData("text/html", div.innerHTML);
+                evt.preventDefault && evt.preventDefault();
+                evt.returnValue = false;
+            }
+        } catch (error) {}
+    }
 
     function initZeroClipboard() {
         ZeroClipboard.config({
@@ -19543,13 +19995,11 @@ UE.plugin.register("copy", function () {
         // 复制内容
         client.on("copy", function (e) {
             var client = e.client,
-                rng = me.selection.getRange(),
-                div = document.createElement("div");
+                div = getCopiedHtmlContainer();
 
-            div.appendChild(rng.cloneContents());
             client.setText(div.innerText || div.textContent);
             client.setHtml(div.innerHTML);
-            rng.select();
+            me.selection.getRange().select();
         });
         // hover事件传递到target
         client.on("mouseover mouseout", function (e) {
@@ -19574,6 +20024,7 @@ UE.plugin.register("copy", function () {
     return {
         bindEvents: {
             ready: function () {
+                domUtils.on(me.body, "copy", handleNativeCopy);
                 if (!browser.ie) {
                     if (window.ZeroClipboard) {
                         initZeroClipboard();
@@ -19608,7 +20059,7 @@ UE.plugin.register("copy", function () {
     };
 });
 
-
+
 // plugins/paste.js
 ///import core
 ///import plugins/inserthtml.js
@@ -19966,7 +20417,7 @@ UE.plugins["paste"] = function () {
     };
 };
 
-
+
 // plugins/puretxtpaste.js
 /**
  * 纯文本粘贴插件
@@ -20078,7 +20529,7 @@ UE.plugins["pasteplain"] = function () {
     };
 };
 
-
+
 // plugins/list.js
 /**
  * 有序列表,无序列表插件
@@ -21526,7 +21977,7 @@ UE.plugins["list"] = function () {
     };
 };
 
-
+
 // plugins/source.js
 /**
  * 源码编辑插件
@@ -21887,7 +22338,7 @@ UE.plugins["list"] = function () {
     };
 })();
 
-
+
 // plugins/enterkey.js
 ///import core
 ///import plugins/undo.js
@@ -22090,7 +22541,7 @@ UE.plugins["enterkey"] = function () {
     });
 };
 
-
+
 // plugins/keystrokes.js
 /* 处理特殊键的兼容性问题 */
 UE.plugins["keystrokes"] = function () {
@@ -22358,7 +22809,7 @@ UE.plugins["keystrokes"] = function () {
     });
 };
 
-
+
 // plugins/fiximgclick.js
 ///import core
 ///commands 修复chrome下图片不能点击的问题，出现八个角可改变大小
@@ -22751,7 +23202,7 @@ UE.plugins["fiximgclick"] = (function () {
     };
 })();
 
-
+
 // plugins/autolink.js
 ///import core
 ///commands 为非ie浏览器自动添加a标签
@@ -22974,7 +23425,7 @@ UE.plugin.register(
     }
 );
 
-
+
 // plugins/autoheight.js
 ///import core
 ///commands 当输入内容超过编辑器高度时，编辑器自动增高
@@ -23104,7 +23555,7 @@ UE.plugins["autoheight"] = function () {
     }
 };
 
-
+
 // plugins/autofloat.js
 ///import core
 ///commands 悬浮工具栏
@@ -23177,7 +23628,9 @@ UE.plugins["autofloat"] = function () {
                     "px";
             }
             if (toolbarBox.style.position != "fixed") {
-                toolbarBox.style.position = "fixed";
+                        toolbarBox.style.position = "";
+                        toolbarBox.style.zIndex = "";
+                        toolbarBox.style.width = "";
                 toolbarBox.style.top = topOffset + "px";
                 (origalFloat == "absolute" || origalFloat == "relative") &&
                 parseFloat(origalLeft) &&
@@ -23261,7 +23714,7 @@ UE.plugins["autofloat"] = function () {
     });
 };
 
-
+
 // plugins/video.js
 /**
  * video插件， 为UEditor提供视频插入支持
@@ -23287,7 +23740,7 @@ UE.plugins["video"] = function () {
             case 'iframe':
                 str = '<iframe class="' + classname + '" ' +
                     ' src="' + utils.html(url) + '" width="' + width + '" height="' + height + '"' +
-                    ' frameborder=0 allowfullscreen>';
+                    ' frameborder="0" allowfullscreen></iframe>';
                 break;
             case "image":
                 str =
@@ -23300,7 +23753,6 @@ UE.plugins["video"] = function () {
                     '" _url="' +
                     url +
                     '" class="' +
-                    classname +
                     '"' +
                     ' src="' +
                     me.options.UEDITOR_HOME_URL +
@@ -23485,13 +23937,12 @@ UE.plugins["video"] = function () {
             ) {
                 var currentVideo = videoObjs[0];
                 var currentVideoType = 'iframe';
-                var isUploadVideo = currentVideo.url.match(/.mp4$/);
-                if (isUploadVideo) {
-                    currentVideoType = 'image';
+                if (currentVideo.url.match(/.mp4$/)) {
+                    currentVideoType = 'video';
                 }
-                var currentClassName = isUploadVideo
-                    ? "edui-upload-video"
-                    : "edui-video-iframe";
+                var currentClassName = currentVideoType == "iframe"
+                    ? "edui-video-iframe"
+                    : "edui-video-video";
                 var currentHtml = creatInsertStr(
                     currentVideo.url,
                     currentVideo.width || currentNode.width || 420,
@@ -23517,13 +23968,12 @@ UE.plugins["video"] = function () {
             for (var i = 0, vi, len = videoObjs.length; i < len; i++) {
                 vi = videoObjs[i];
                 var videoType = 'iframe';
-                var isUploadVideo = vi.url.match(/.mp4$/);
-                if (isUploadVideo) {
-                    videoType = 'image';
+                if (vi.url.match(/.mp4$/)) {
+                    videoType = 'video';
                 }
-                cl = isUploadVideo
-                    ? "edui-upload-video"
-                    : "edui-video-iframe";
+                cl = videoType == "iframe"
+                    ? "edui-video-iframe"
+                    : "edui-video-video";
                 html.push(
                     creatInsertStr(
                         vi.url,
@@ -23560,7 +24010,7 @@ UE.plugins["video"] = function () {
     };
 };
 
-
+
 // plugins/audio.js
 UE.plugins["audio"] = function () {
     var me = this;
@@ -23658,7 +24108,7 @@ UE.plugins["audio"] = function () {
     };
 };
 
-
+
 // plugins/table.core.js
 /**
  * Created with JetBrains WebStorm.
@@ -25019,7 +25469,7 @@ UE.plugins["audio"] = function () {
     }
 })();
 
-
+
 // plugins/table.cmds.js
 /**
  * Created with JetBrains PhpStorm.
@@ -26070,7 +26520,7 @@ UE.plugins["audio"] = function () {
     }
 })();
 
-
+
 // plugins/table.action.js
 /**
  * Created with JetBrains PhpStorm.
@@ -26200,7 +26650,6 @@ UE.plugins["table"] = function () {
             "td,th{padding: 5px 10px;border: 1px solid #DDD;}" +
             "caption{border:1px dashed #DDD;border-bottom:0;padding:3px;text-align:center;}" +
             "th{border-top:1px solid #BBB;background-color:#F7F7F7;}" +
-            "table tr.firstRow th{border-top-width:2px;}" +
             ".ue-table-interlace-color-single{ background-color: #fcfcfc; } .ue-table-interlace-color-double{ background-color: #f7faff; }" +
             "td p{margin:0;padding:0;}",
             me.document
@@ -28099,7 +28548,7 @@ UE.plugins["table"] = function () {
     }
 };
 
-
+
 // plugins/table.sort.js
 /**
  * Created with JetBrains PhpStorm.
@@ -28304,7 +28753,7 @@ UE.plugins["tablesort"] = function () {
     };
 };
 
-
+
 // plugins/contextmenu.js
 ///import core
 ///commands 右键菜单
@@ -28842,7 +29291,7 @@ UE.plugins["contextmenu"] = function () {
     });
 };
 
-
+
 // plugins/shortcutmenu.js
 ///import core
 ///commands       弹出菜单
@@ -28884,7 +29333,6 @@ UE.plugins["shortcutmenu"] = function () {
                 me._activeVideoTarget = mediaTarget;
                 me.selection.getRange().selectNode(mediaTarget).select(true);
             }
-            // console.log(e, me.selection.getRange());
             // var rng = me.selection.getRange();
             // if (rng.collapsed) {
             //     return;
@@ -28933,7 +29381,7 @@ UE.plugins["shortcutmenu"] = function () {
     });
 };
 
-
+
 // plugins/basestyle.js
 /**
  * B、I、sub、super命令支持
@@ -29088,7 +29536,7 @@ UE.plugins["basestyle"] = function () {
     }
 };
 
-
+
 // plugins/elementpath.js
 /**
  * 选取路径命令
@@ -29133,7 +29581,7 @@ UE.plugins["elementpath"] = function () {
     };
 };
 
-
+
 // plugins/formatmatch.js
 /**
  * 格式刷，只格式inline的
@@ -29263,7 +29711,7 @@ UE.plugins["formatmatch"] = function () {
     };
 };
 
-
+
 // plugins/searchreplace.js
 ///import core
 ///commands 查找替换
@@ -29508,7 +29956,7 @@ UE.plugin.register("searchreplace", function () {
     };
 });
 
-
+
 // plugins/customstyle.js
 /**
  * 自定义样式
@@ -29692,7 +30140,7 @@ UE.plugins["customstyle"] = function () {
     });
 };
 
-
+
 // plugins/catchremoteimage.js
 ///import core
 ///commands 远程图片抓取
@@ -29901,7 +30349,7 @@ UE.plugins["catchremoteimage"] = function () {
     });
 };
 
-
+
 // plugins/insertparagraph.js
 /**
  * 插入段落
@@ -29947,7 +30395,7 @@ UE.commands["insertparagraph"] = {
     }
 };
 
-
+
 // plugins/template.js
 ///import core
 ///import plugins\inserthtml.js
@@ -29997,7 +30445,7 @@ UE.plugins["template"] = function () {
     });
 };
 
-
+
 // plugins/autoupload.js
 /**
  * @description
@@ -30283,7 +30731,7 @@ UE.plugin.register("autoupload", function () {
     };
 });
 
-
+
 // plugins/section.js
 /**
  * 目录大纲支持插件
@@ -30595,7 +31043,7 @@ UE.plugin.register("section", function () {
     };
 });
 
-
+
 // plugins/simpleupload.js
 /**
  * @description
@@ -30787,7 +31235,7 @@ UE.plugin.register("simpleupload", function () {
     };
 });
 
-
+
 // plugins/serverparam.js
 /**
  * 服务器提交的额外参数列表设置插件
@@ -30900,7 +31348,7 @@ UE.plugin.register("serverparam", function () {
     };
 });
 
-
+
 // plugins/insertfile.js
 /**
  * 插入附件
@@ -30989,7 +31437,7 @@ UE.plugin.register("insertfile", function () {
     };
 });
 
-
+
 // plugins/markdown-shortcut.js
 UE.plugins["markdown-shortcut"] = function () {
 
@@ -31073,7 +31521,7 @@ UE.plugins["markdown-shortcut"] = function () {
 
 };
 
-
+
 // plugins/quick-operate.js
 UE.plugins["quick-operate"] = function () {
 
@@ -31131,13 +31579,13 @@ UE.plugins["quick-operate"] = function () {
 
 };
 
-
+
 // ui/ui.js
-var baidu = baidu || {};
-baidu.editor = baidu.editor || {};
-UE.ui = baidu.editor.ui = {};
+var baidu = baidu || {};
+baidu.editor = baidu.editor || {};
+UE.ui = baidu.editor.ui = {};
+
 
-
 // ui/uiutils.js
 (function () {
     var browser = baidu.editor.browser,
@@ -31421,7 +31869,7 @@ UE.ui = baidu.editor.ui = {};
     }
 })();
 
-
+
 // ui/uibase.js
 (function () {
     var utils = baidu.editor.utils,
@@ -31528,7 +31976,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(UIBase, EventBase);
 })();
 
-
+
 // ui/separator.js
 (function () {
     var utils = baidu.editor.utils,
@@ -31549,7 +31997,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(Separator, UIBase);
 })();
 
-
+
 // ui/mask.js
 ///import core
 ///import uicore
@@ -31605,7 +32053,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(Mask, UIBase);
 })();
 
-
+
 // ui/popup.js
 ///import core
 ///import uicore
@@ -31875,7 +32323,7 @@ UE.ui = baidu.editor.ui = {};
     });
 })();
 
-
+
 // ui/colorpicker.js
 ///import core
 ///import uicore
@@ -31980,7 +32428,7 @@ UE.ui = baidu.editor.ui = {};
     }
 })();
 
-
+
 // ui/tablepicker.js
 ///import core
 ///import uicore
@@ -32085,7 +32533,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(TablePicker, UIBase);
 })();
 
-
+
 // ui/stateful.js
 (function () {
     var browser = baidu.editor.browser,
@@ -32198,7 +32646,7 @@ UE.ui = baidu.editor.ui = {};
     };
 })();
 
-
+
 // ui/button.js
 ///import core
 ///import uicore
@@ -32281,7 +32729,7 @@ UE.ui = baidu.editor.ui = {};
     utils.extend(Button.prototype, Stateful);
 })();
 
-
+
 // ui/splitbutton.js
 ///import core
 ///import uicore
@@ -32383,7 +32831,7 @@ UE.ui = baidu.editor.ui = {};
     utils.extend(SplitButton.prototype, Stateful, true);
 })();
 
-
+
 // ui/colorbutton.js
 ///import core
 ///import uicore
@@ -32447,7 +32895,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(ColorButton, SplitButton);
 })();
 
-
+
 // ui/tablebutton.js
 ///import core
 ///import uicore
@@ -32486,7 +32934,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(TableButton, SplitButton);
 })();
 
-
+
 // ui/autotypesetpicker.js
 ///import core
 ///import uicore
@@ -32659,7 +33107,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(AutoTypeSetPicker, UIBase);
 })();
 
-
+
 // ui/autotypesetbutton.js
 ///import core
 ///import uicore
@@ -32813,7 +33261,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(AutoTypeSetButton, SplitButton);
 })();
 
-
+
 // ui/cellalignpicker.js
 ///import core
 ///import uicore
@@ -32915,7 +33363,7 @@ UE.ui = baidu.editor.ui = {};
     utils.extend(CellAlignPicker.prototype, Stateful, true);
 })();
 
-
+
 // ui/pastepicker.js
 ///import core
 ///import uicore
@@ -32989,7 +33437,7 @@ UE.ui = baidu.editor.ui = {};
     utils.extend(PastePicker.prototype, Stateful, true);
 })();
 
-
+
 // ui/toolbar.js
 (function () {
     var utils = baidu.editor.utils,
@@ -33041,7 +33489,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(Toolbar, UIBase);
 })();
 
-
+
 // ui/quick-operate.js
 ///import core
 ///import uicore
@@ -33337,7 +33785,7 @@ UE.ui = baidu.editor.ui = {};
     // utils.extend(MenuItem.prototype, Stateful, true);
 })();
 
-
+
 // ui/menu.js
 ///import core
 ///import uicore
@@ -33621,7 +34069,7 @@ UE.ui = baidu.editor.ui = {};
     utils.extend(MenuItem.prototype, Stateful, true);
 })();
 
-
+
 // ui/combox.js
 ///import core
 ///import uicore
@@ -33723,7 +34171,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(Combox, SplitButton);
 })();
 
-
+
 // ui/dialog.js
 ///import core
 ///import uicore
@@ -34216,7 +34664,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(Dialog, UIBase);
 })();
 
-
+
 // ui/menubutton.js
 ///import core
 ///import uicore
@@ -34258,7 +34706,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(MenuButton, SplitButton);
 })();
 
-
+
 // ui/multiMenu.js
 ///import core
 ///import uicore
@@ -34306,7 +34754,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(MultiMenuPop, SplitButton);
 })();
 
-
+
 // ui/shortcutmenu.js
 (function () {
     var UI = baidu.editor.ui,
@@ -34576,7 +35024,7 @@ UE.ui = baidu.editor.ui = {};
     });
 })();
 
-
+
 // ui/breakline.js
 (function () {
     var utils = baidu.editor.utils,
@@ -34597,7 +35045,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(Breakline, UIBase);
 })();
 
-
+
 // ui/message.js
 ///import core
 ///import uicore
@@ -34682,7 +35130,7 @@ UE.ui = baidu.editor.ui = {};
     utils.inherits(Message, UIBase);
 })();
 
-
+
 // adapter/editorui.js
 //ui跟编辑器的适配層
 //那个按钮弹出是dialog，是下拉筐等都是在这个js中配置
@@ -34954,28 +35402,28 @@ UE.ui = baidu.editor.ui = {};
     }
 
     var dialogIframeUrlMap = {
-        anchor: "~/dialogs/anchor/anchor.html?{timestamp}",
-        insertimage: "~/dialogs/image/image.html?{timestamp}",
-        link: "~/dialogs/link/link.html?{timestamp}",
-        spechars: "~/dialogs/spechars/spechars.html?{timestamp}",
-        searchreplace: "~/dialogs/searchreplace/searchreplace.html?{timestamp}",
-        insertvideo: "~/dialogs/video/video.html?{timestamp}",
-        insertaudio: "~/dialogs/audio/audio.html?{timestamp}",
-        help: "~/dialogs/help/help.html?{timestamp}",
-        preview: "~/dialogs/preview/preview.html?{timestamp}",
-        emotion: "~/dialogs/emotion/emotion.html?{timestamp}",
-        wordimage: "~/dialogs/wordimage/wordimage.html?{timestamp}",
-        formula: "~/dialogs/formula/formula.html?{timestamp}",
-        attachment: "~/dialogs/attachment/attachment.html?{timestamp}",
-        insertframe: "~/dialogs/insertframe/insertframe.html?{timestamp}",
-        edittip: "~/dialogs/table/edittip.html?{timestamp}",
-        edittable: "~/dialogs/table/edittable.html?{timestamp}",
-        edittd: "~/dialogs/table/edittd.html?{timestamp}",
-        scrawl: "~/dialogs/scrawl/scrawl.html?{timestamp}",
-        template: "~/dialogs/template/template.html?{timestamp}",
-        background: "~/dialogs/background/background.html?{timestamp}",
-        contentimport: "~/dialogs/contentimport/contentimport.html?{timestamp}",
-        ai: "~/dialogs/ai/ai.html?{timestamp}",
+        anchor: "~/dialogs/anchor/anchor.html?eb9739cc",
+        insertimage: "~/dialogs/image/image.html?afbedf05",
+        link: "~/dialogs/link/link.html?fa72bcd7",
+        spechars: "~/dialogs/spechars/spechars.html?3b88f009",
+        searchreplace: "~/dialogs/searchreplace/searchreplace.html?3167e75a",
+        insertvideo: "~/dialogs/video/video.html?c2c9fa02",
+        insertaudio: "~/dialogs/audio/audio.html?47891a09",
+        help: "~/dialogs/help/help.html?4bb38d19",
+        preview: "~/dialogs/preview/preview.html?b533ff4e",
+        emotion: "~/dialogs/emotion/emotion.html?c5e06473",
+        wordimage: "~/dialogs/wordimage/wordimage.html?6c25c600",
+        formula: "~/dialogs/formula/formula.html?a3bc14af",
+        attachment: "~/dialogs/attachment/attachment.html?8cf1bb27",
+        insertframe: "~/dialogs/insertframe/insertframe.html?9353d50c",
+        edittip: "~/dialogs/table/edittip.html?7f922949",
+        edittable: "~/dialogs/table/edittable.html?c2a698ec",
+        edittd: "~/dialogs/table/edittd.html?e110da33",
+        scrawl: "~/dialogs/scrawl/scrawl.html?185f463e",
+        template: "~/dialogs/template/template.html?4ec66ee4",
+        background: "~/dialogs/background/background.html?63701ca2",
+        contentimport: "~/dialogs/contentimport/contentimport.html?96da835f",
+        ai: "~/dialogs/ai/ai.html?86145ec2",
     };
     var dialogBtns = {
         noOk: ["searchreplace", "help", "spechars", "preview"],
@@ -35133,14 +35581,10 @@ UE.ui = baidu.editor.ui = {};
                                             return (
                                                 activeNode.tagName === "VIDEO" ||
                                                 activeNode.tagName === "IFRAME" ||
-                                                activeNode.className == "edui-faked-video" ||
-                                                activeNode.className.indexOf("edui-faked-video") != -1 ||
-                                                activeNode.className == "edui-upload-video" ||
-                                                activeNode.className.indexOf("edui-upload-video") != -1 ||
-                                                activeNode.className == "edui-video-iframe" ||
-                                                activeNode.className.indexOf("edui-video-iframe") != -1 ||
-                                                activeNode.className == "edui-video-video" ||
-                                                activeNode.className.indexOf("edui-video-video") != -1
+                                                activeNode.className.indexOf("edui-video-iframe") !== -1 ||
+                                                activeNode.className.indexOf("edui-video-video") !== -1 ||
+                                                activeNode.className.indexOf("edui-faked-video") !== -1 ||
+                                                activeNode.className.indexOf("edui-upload-video") !== -1
                                             );
                                         }
                                         return false;
@@ -35174,6 +35618,45 @@ UE.ui = baidu.editor.ui = {};
             editor.options.labelMap["insertcode"] ||
             editor.getLang("labelMap.insertcode") ||
             "";
+        var normalizeInsertCodeUiLanguage = function (lang) {
+            if (!lang) return "";
+            lang = (lang + "").toLowerCase();
+            var aliasMap = {
+                javascript: "js",
+                jscript: "js",
+                shell: "bash",
+                sh: "bash",
+                powershell: "ps",
+                csharp: "c#",
+                plaintext: "plain",
+                text: "plain",
+                txt: "plain"
+            };
+            return aliasMap[lang] || lang;
+        };
+        var getInsertCodeUiLanguage = function () {
+            var range = editor.selection && editor.selection.getRange
+                ? editor.selection.getRange()
+                : null;
+            var startContainer = range && range.startContainer;
+            var codeNode = domUtils.findParentByTagName(startContainer, "code", true);
+            var preNode = domUtils.findParentByTagName(startContainer, "pre", true);
+            var readLang = function (node) {
+                if (!node) return "";
+                var dataLang = node.getAttribute ? node.getAttribute("data-code-lang") : "";
+                if (dataLang) {
+                    return normalizeInsertCodeUiLanguage(dataLang);
+                }
+                var className = node.className || "";
+                var match = (className + "").match(/(?:^|\s)language-([^\s]+)/);
+                if (match && match[1]) {
+                    return normalizeInsertCodeUiLanguage(match[1]);
+                }
+                match = (className + "").match(/brush:([^;]+)/);
+                return match && match[1] ? normalizeInsertCodeUiLanguage(match[1]) : "";
+            };
+            return readLang(codeNode) || readLang(preNode);
+        };
         // if (!list.length) return;
         var items = [];
         utils.each(list, function (key, val) {
@@ -35219,7 +35702,8 @@ UE.ui = baidu.editor.ui = {};
                     ui.setDisabled(true);
                 } else {
                     ui.setDisabled(false);
-                    var value = editor.queryCommandValue("insertcode");
+                    var value =
+                        getInsertCodeUiLanguage() || editor.queryCommandValue("insertcode");
                     if (!value) {
                         ui.setValue(title);
                         return;
@@ -35793,7 +36277,7 @@ UE.ui = baidu.editor.ui = {};
 
 })();
 
-
+
 // adapter/editor.js
 ///import core
 ///commands 全屏
@@ -36674,7 +37158,7 @@ UE.ui = baidu.editor.ui = {};
         editor.options.editor = editor;
         utils.loadFile(document, {
             href:
-                editor.options.themePath + editor.options.theme + "/css/ueditor.css?{timestamp:dist/themes/default/css/ueditor.css}",
+                editor.options.themePath + editor.options.theme + "/css/ueditor.css?dfa5e8ae",
             tag: "link",
             type: "text/css",
             rel: "stylesheet"
@@ -36824,7 +37308,7 @@ UE.ui = baidu.editor.ui = {};
     };
 })();
 
-
+
 // adapter/message.js
 UE.registerUI("message", function (editor) {
     var editorui = baidu.editor.ui;
@@ -36894,6 +37378,11 @@ UE.registerUI("message", function (editor) {
     }
 });
 
-
-
-})();
+
+
+})();
+
+
+
+
+