X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftiny_mce%2Fplugins%2Fxhtmlxtras%2Fjs%2Fdel.js;h=1f957dc786044d69ecf9c2349f4f128a9ecb7c72;hb=b05f4eef4014db3885787ef15107cba93c932ac9;hp=7049f2beb4e18e5b85b35a484623cf65716b5fd3;hpb=7ce246db4a173b9c738e8e160f8d0030d4e82d78;p=citadel.git

diff --git a/webcit/tiny_mce/plugins/xhtmlxtras/js/del.js b/webcit/tiny_mce/plugins/xhtmlxtras/js/del.js
index 7049f2beb..1f957dc78 100644
--- a/webcit/tiny_mce/plugins/xhtmlxtras/js/del.js
+++ b/webcit/tiny_mce/plugins/xhtmlxtras/js/del.js
@@ -1,8 +1,11 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+/**
+ * del.js
  *
- * @author Moxiecode - based on work by Andrew Tetlaw
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
 function init() {
@@ -18,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);
@@ -42,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();