From 619cb9440ccf12e7d672f301477018b431d57afe Mon Sep 17 00:00:00 2001 From: popcorner <351633+popcorner@user.noreply.gitee.com> Date: Sun, 19 Apr 2020 02:07:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20IE11=E5=8F=8Afirefox?= =?UTF-8?q?=E5=9C=A8=E4=BD=BF=E7=94=A8=E7=BC=96=E8=BE=91=E5=99=A8=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E6=97=B6=E5=80=99=E5=87=BA=E7=8E=B0=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- upload/static/js/editor.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/upload/static/js/editor.js b/upload/static/js/editor.js index 7e10eda8d..23f56e697 100644 --- a/upload/static/js/editor.js +++ b/upload/static/js/editor.js @@ -998,15 +998,11 @@ function showEditorMenu(tag, params) { var menutype = 'menu'; try { - sel = wysiwyg ? (editdoc.selection.createRange() ? editdoc.selection.createRange() : editdoc.getSelection().getRangeAt(0)) : document.selection.createRange(); - } catch(e) {} - - selection = sel ? (wysiwyg ? sel.htmlText : sel.text) : getSel(); - - if(BROWSER.rv) { - selection = editdoc.getSelection(); - sel = selection.getRangeAt(0); - selection = readNodes(sel.cloneContents(), false); + sel = wysiwyg ? editdoc.selection.createRange() : document.selection.createRange(); + selection = wysiwyg ? sel.htmlText : sel.text; + } catch(e) { + sel = wysiwyg ? editdoc.getSelection().getRangeAt(0) : undefined; + selection = getSel(); } if(menu) { -- Gitee