From a2e09c950d8716346b151f7980df1b51ebfbdd78 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Tue, 15 Apr 2014 12:35:33 -0400 Subject: [PATCH] Use methods chaining, don't use deprecated row_init method --- program/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/program/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/program/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js index 5b494a5..4e5d9c3 100644 --- a/program/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js +++ b/program/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js @@ -154,7 +154,6 @@ SXE.insertElement = function(element_name) { var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName; - tinyMCEPopup.execCommand('mceBeginUndoLevel'); if (elm == null) { var s = SXE.inst.selection.getContent(); if(s.length > 0) { @@ -165,11 +164,11 @@ for (var i=0; i<elementArray.length; i++) { var elm = elementArray[i]; - if (SXE.inst.dom.getAttrib(elm, '_mce_new')) { + if (SXE.inst.dom.getAttrib(elm, 'data-mce-new')) { elm.id = ''; elm.setAttribute('id', ''); elm.removeAttribute('id'); - elm.removeAttribute('_mce_new'); + elm.removeAttribute('data-mce-new'); setAllCommonAttribs(elm); } @@ -186,7 +185,6 @@ element_name = element_name.toLowerCase(); elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()); if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){ - tinyMCEPopup.execCommand('mceBeginUndoLevel'); tinyMCE.execCommand('mceRemoveNode', false, elm); SXE.inst.nodeChanged(); tinyMCEPopup.execCommand('mceEndUndoLevel'); @@ -226,6 +224,6 @@ ed.getDoc().execCommand('FontName', false, 'mceinline'); tinymce.each(dom.select('span,font'), function(n) { if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline') - dom.replace(dom.create(en, {_mce_new : 1}), n, 1); + dom.replace(dom.create(en, {'data-mce-new' : 1}), n, 1); }); } -- Gitblit v1.9.1