Refs #3510, #9113. Updated tinyMCE version in trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 2 insertions, 12 deletions

diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
index 9e5d8c571..1f957dc78 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
@@ -21,17 +21,17 @@ function setElementAttribs(elm) {
 	setAllCommonAttribs(elm);

 	setAttrib(elm, 'datetime');

 	setAttrib(elm, 'cite');

+	elm.removeAttribute('data-mce-new');

 }

 

 function insertDel() {

 	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');

 

-	tinyMCEPopup.execCommand('mceBeginUndoLevel');

 	if (elm == null) {

 		var s = SXE.inst.selection.getContent();

 		if(s.length > 0) {

 			insertInlineElement('del');

-			var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});

+			var elementArray = SXE.inst.dom.select('del[data-mce-new]');

 			for (var i=0; i<elementArray.length; i++) {

 				var elm = elementArray[i];

 				setElementAttribs(elm);

@@ -45,16 +45,6 @@ function insertDel() {
 	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);

-	});

-}

-

 function removeDel() {

 	SXE.removeElement('del');

 	tinyMCEPopup.close();