X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftiny_mce%2Fplugins%2Fxhtmlxtras%2Fjs%2Felement_common.js;h=4e5d9c3bbd81e61a49d2b0927a4eec38e0a56c7f;hb=b05f4eef4014db3885787ef15107cba93c932ac9;hp=5cdeb21a46938e68d3c39bddc674ad8991888cbc;hpb=7ce246db4a173b9c738e8e160f8d0030d4e82d78;p=citadel.git

diff --git a/webcit/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/webcit/tiny_mce/plugins/xhtmlxtras/js/element_common.js
index 5cdeb21a4..4e5d9c3bb 100644
--- a/webcit/tiny_mce/plugins/xhtmlxtras/js/element_common.js
+++ b/webcit/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -1,8 +1,11 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+/**
+ * element_common.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
  */
 
 tinyMCEPopup.requireLangPack();
@@ -151,25 +154,21 @@ SXE.initElementDialog = function(element_name) {
 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) {
 			tagName = element_name;
 
-			if (tinymce.isIE && element_name.indexOf('html:') == 0)
-				element_name = element_name.substring(5).toLowerCase();
-
 			insertInlineElement(element_name);
 			var elementArray = tinymce.grep(SXE.inst.dom.select(element_name));
 			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 @@ SXE.removeElement = function(element_name){
 	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');
@@ -194,7 +192,7 @@ SXE.removeElement = function(element_name){
 }
 
 SXE.showRemoveButton = function() {
-		document.getElementById("remove").style.display = 'block';
+		document.getElementById("remove").style.display = '';
 }
 
 SXE.containsClass = function(elm,cl) {
@@ -224,8 +222,8 @@ 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) {
+	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);
 	});
 }