upgrade TinyMCE to 3.4.x

[quix0rs-gnu-social.git] / plugins / TinyMCE / js / plugins / xhtmlxtras / editor_plugin_src.js

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js
index 9b51b8368de2c40e153ff97e7c598af8a5ffdd70..f24057211c4ce2059912fec74c80bd3835914349 100644 (file)
--- a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js
@@ -27,7 +27,7 @@
                                ed.windowManager.open({\r
                                        file : url + '/acronym.htm',\r
                                        width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),\r
-                                       height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),\r
+                                       height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_height', 0)),\r
                                        inline : 1\r
                                }, {\r
                                        plugin_url : url\r
@@ -38,7 +38,7 @@
                                ed.windowManager.open({\r
                                        file : url + '/abbr.htm',\r
                                        width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),\r
-                                       height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),\r
+                                       height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_height', 0)),\r
                                        inline : 1\r
                                }, {\r
                                        plugin_url : url\r
@@ -49,7 +49,7 @@
                                ed.windowManager.open({\r
                                        file : url + '/del.htm',\r
                                        width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),\r
-                                       height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),\r
+                                       height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_height', 0)),\r
                                        inline : 1\r
                                }, {\r
                                        plugin_url : url\r
@@ -60,7 +60,7 @@
                                ed.windowManager.open({\r
                                        file : url + '/ins.htm',\r
                                        width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),\r
-                                       height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),\r
+                                       height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_height', 0)),\r
                                        inline : 1\r
                                }, {\r
                                        plugin_url : url\r
@@ -70,8 +70,8 @@
                        ed.addCommand('mceAttributes', function() {\r
                                ed.windowManager.open({\r
                                        file : url + '/attributes.htm',\r
-                                       width : 380,\r
-                                       height : 370,\r
+                                       width : 380 + parseInt(ed.getLang('xhtmlxtras.attr_delta_width', 0)),\r
+                                       height : 370 + parseInt(ed.getLang('xhtmlxtras.attr_delta_height', 0)),\r
                                        inline : 1\r
                                }, {\r
                                        plugin_url : url\r
@@ -86,18 +86,6 @@
                        ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'});\r
                        ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'});\r
 \r
-                       if (tinymce.isIE) {\r
-                               function fix(ed, o) {\r
-                                       if (o.set) {\r
-                                               o.content = o.content.replace(/<abbr([^>]+)>/gi, '<html:abbr $1>');\r
-                                               o.content = o.content.replace(/<\/abbr>/gi, '</html:abbr>');\r
-                                       }\r
-                               };\r
-\r
-                               ed.onBeforeSetContent.add(fix);\r
-                               ed.onPostProcess.add(fix);\r
-                       }\r
-\r
                        ed.onNodeChange.add(function(ed, cm, n, co) {\r
                                n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS');\r
 \r