From f55779fd831029f764c885bf1fd026a7e94f08eb Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 20 Mar 2012 20:47:31 -0700
Subject: update tinymce to 3.5b2 to fix issues with FF 11 and pasting into
 code blocks

---
 .../tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js

(limited to 'library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js')

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js b/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
old mode 100755
new mode 100644
index 9e5d8c571..1f957dc78
--- a/library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js
+++ b/library/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();
-- 
cgit v1.2.3