From f06aa8058b7e32ba32d4551074b6e0b8a300f751 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Mon, 21 Oct 2013 15:02:40 -0400 Subject: [PATCH] Bump version after security fix --- program/js/tiny_mce/plugins/xhtmlxtras/js/ins.js | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/program/js/tiny_mce/plugins/xhtmlxtras/js/ins.js b/program/js/tiny_mce/plugins/xhtmlxtras/js/ins.js index 3774f0a..c4addfb 100644 --- a/program/js/tiny_mce/plugins/xhtmlxtras/js/ins.js +++ b/program/js/tiny_mce/plugins/xhtmlxtras/js/ins.js @@ -21,16 +21,17 @@ setAllCommonAttribs(elm); setAttrib(elm, 'datetime'); setAttrib(elm, 'cite'); + elm.removeAttribute('data-mce-new'); } function insertIns() { var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS'); - tinyMCEPopup.execCommand('mceBeginUndoLevel'); + if (elm == null) { var s = SXE.inst.selection.getContent(); if(s.length > 0) { - insertInlineElement('INS'); - var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';}); + insertInlineElement('ins'); + var elementArray = SXE.inst.dom.select('ins[data-mce-new]'); for (var i=0; i<elementArray.length; i++) { var elm = elementArray[i]; setElementAttribs(elm); @@ -47,16 +48,6 @@ function removeIns() { SXE.removeElement('ins'); tinyMCEPopup.close(); -} - -function insertInlineElement(en) { - var ed = tinyMCEPopup.editor, dom = ed.dom; - - ed.getDoc().execCommand('FontName', false, 'mceinline'); - tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) { - if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline') - dom.replace(dom.create(en), n, 1); - }); } tinyMCEPopup.onInit.add(init); -- Gitblit v1.9.1