Upgrade TinyMCE

[citadel.git] / webcit / tiny_mce / plugins / xhtmlxtras / js / element_common.js

diff --git a/webcit/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/webcit/tiny_mce/plugins/xhtmlxtras/js/element_common.js
index 5cdeb21a46938e68d3c39bddc674ad8991888cbc..5b494a56601b5f8829cd2f4f1aa98044d92acd6d 100644 (file)
--- a/webcit/tiny_mce/plugins/xhtmlxtras/js/element_common.js
+++ b/webcit/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -1,8 +1,11 @@
- /**\r
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $\r
+/**\r
+ * element_common.js\r
  *\r
- * @author Moxiecode - based on work by Andrew Tetlaw\r
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.\r
+ * Copyright 2009, Moxiecode Systems AB\r
+ * Released under LGPL License.\r
+ *\r
+ * License: http://tinymce.moxiecode.com/license\r
+ * Contributing: http://tinymce.moxiecode.com/contributing\r
  */\r
 \r
 tinyMCEPopup.requireLangPack();\r
@@ -157,9 +160,6 @@ SXE.insertElement = function(element_name) {
                if(s.length > 0) {\r
                        tagName = element_name;\r
 \r
-                       if (tinymce.isIE && element_name.indexOf('html:') == 0)\r
-                               element_name = element_name.substring(5).toLowerCase();\r
-\r
                        insertInlineElement(element_name);\r
                        var elementArray = tinymce.grep(SXE.inst.dom.select(element_name));\r
                        for (var i=0; i<elementArray.length; i++) {\r
@@ -194,7 +194,7 @@ SXE.removeElement = function(element_name){
 }\r
 \r
 SXE.showRemoveButton = function() {\r
-               document.getElementById("remove").style.display = 'block';\r
+               document.getElementById("remove").style.display = '';\r
 }\r
 \r
 SXE.containsClass = function(elm,cl) {\r
@@ -224,7 +224,7 @@ function insertInlineElement(en) {
        var ed = tinyMCEPopup.editor, dom = ed.dom;\r
 \r
        ed.getDoc().execCommand('FontName', false, 'mceinline');\r
-       tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {\r
+       tinymce.each(dom.select('span,font'), function(n) {\r
                if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')\r
                        dom.replace(dom.create(en, {_mce_new : 1}), n, 1);\r
        });\r