From 8011e6016b9c8d1d6decd1fffcb1011451edcb4b Mon Sep 17 00:00:00 2001
From: azaozz
Date: Fri, 27 Mar 2009 12:57:25 +0000
Subject: [PATCH] TinyMCE 3.2.2.3, has several bugfixes
git-svn-id: http://svn.automattic.com/wordpress/trunk@10845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/css/colors-classic.css | 1 -
wp-admin/css/colors-fresh.css | 1 -
wp-admin/js/editor.dev.js | 16 +++++++--
wp-admin/js/editor.js | 2 +-
.../tinymce/plugins/fullscreen/fullscreen.htm | 2 +-
.../tinymce/plugins/inlinepopups/template.htm | 2 +-
.../js/tinymce/plugins/media/media.htm | 14 ++++----
.../js/tinymce/plugins/paste/blank.htm | 2 +-
.../js/tinymce/plugins/paste/pastetext.htm | 4 +--
.../js/tinymce/plugins/paste/pasteword.htm | 6 ++--
.../plugins/wpeditimage/editimage.html | 8 ++---
.../js/tinymce/themes/advanced/about.htm | 6 ++--
.../js/tinymce/themes/advanced/anchor.htm | 4 +--
.../js/tinymce/themes/advanced/charmap.htm | 4 +--
.../tinymce/themes/advanced/color_picker.htm | 6 ++--
.../js/tinymce/themes/advanced/image.htm | 8 ++---
.../js/tinymce/themes/advanced/link.htm | 10 +++---
.../themes/advanced/skins/wp_theme/ui.css | 32 ++++--------------
.../tinymce/themes/advanced/source_editor.htm | 4 +--
wp-includes/js/tinymce/tiny_mce.js | 2 +-
wp-includes/js/tinymce/wp-mce-help.php | 2 +-
wp-includes/js/tinymce/wp-tinymce.js | 2 +-
wp-includes/js/tinymce/wp-tinymce.js.gz | Bin 78577 -> 78590 bytes
wp-includes/script-loader.php | 2 +-
24 files changed, 65 insertions(+), 75 deletions(-)
diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css
index c82978aa98..85e996e16e 100644
--- a/wp-admin/css/colors-classic.css
+++ b/wp-admin/css/colors-classic.css
@@ -854,7 +854,6 @@ abbr.required,
/* SplitButton */
.wp_themeSkin .mceSplitButton a.mceAction,
.wp_themeSkin .mceSplitButton a.mceOpen {
- background-color: #e8e8e8;
border-color: #B2B2B2;
}
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 9a394207bb..a1d89892b8 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -854,7 +854,6 @@ abbr.required,
/* SplitButton */
.wp_themeSkin .mceSplitButton a.mceAction,
.wp_themeSkin .mceSplitButton a.mceOpen {
- background-color: #e8e8e8;
border-color: #B2B2B2;
}
diff --git a/wp-admin/js/editor.dev.js b/wp-admin/js/editor.dev.js
index 74b141158e..55a5f418bf 100644
--- a/wp-admin/js/editor.dev.js
+++ b/wp-admin/js/editor.dev.js
@@ -70,8 +70,9 @@ var switchEditors = {
content = content.replace(new RegExp(']*)>', 'g'), '\t');
if ( content.indexOf('
");b=b.replace(new RegExp("]*)>\\s*
","mgi"),"
\n\n");b=b.replace(new RegExp("\\s*
","mgi"),"");b=b.replace(new RegExp("\\s*
\\s*","mgi"),"\n\n");b=b.replace(new RegExp("\\n\\s*\\n","mgi"),"\n\n");b=b.replace(new RegExp("\\s*
\\s*","gi"),"\n");b=b.replace(new RegExp("\\s*
\\s*","mg"),"
\n");b=b.replace(new RegExp("\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*","gi"),"\n\n[caption$1[/caption]\n\n");b=b.replace(new RegExp("caption\\]\\n\\n+\\[caption","g"),"caption]\n\n[caption");a="blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre";b=b.replace(new RegExp("\\s*<(("+a+") ?[^>]*)\\s*>","mg"),"\n<$1>");b=b.replace(new RegExp("\\s*("+a+")>\\s*","mg"),"$1>\n");b=b.replace(new RegExp("
]*)>","g"),"\t");if(b.indexOf("]*)>\\s*","mg"),"");b=b.replace(new RegExp("\\s*\\s*","mg"),"")}b=b.replace(new RegExp("","g"),"\n");b=b.replace(new RegExp("\\s*(]+>.*
)","mg"),"\n$1");b=b.replace(new RegExp("^\\s*",""),"");b=b.replace(new RegExp("[\\s\\u00a0]*$",""),"");b=b.replace(//g,"\n");return b},go:function(g,e){g=g||"content";e=e||this.mode||"";var b=tinyMCE.get(g)||false,f=this.I("quicktags"),c=this.I("edButtonHTML"),d=this.I("edButtonPreview"),a=this.I(g);if("tinymce"==e){if(b&&!b.isHidden()){return false}this.mode="html";a.style.color="#fff";d.className="active";c.className="";edCloseAllTags();f.style.display="none";a.value=this.wpautop(a.value);if(b){b.show()}else{tinyMCE.execCommand("mceAddControl",false,g)}setUserSetting("editor","tinymce")}else{if(!b||b.isHidden()){return false}this.mode="tinymce";c.className="active";d.className="";a.style.height=b.getContentAreaContainer().offsetHeight+6+"px";b.hide();f.style.display="block";a.style.color="";setUserSetting("editor","html")}return false},wpautop:function(a){var b="table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]";a=a+"\n\n";a=a.replace(new RegExp("
\\s*
","gi"),"\n\n");a=a.replace(new RegExp("(<(?:"+b+")[^>]*>)","gi"),"\n$1");a=a.replace(new RegExp("((?:"+b+")>)","gi"),"$1\n\n");a=a.replace(new RegExp("\\r\\n|\\r","g"),"\n");a=a.replace(new RegExp("\\n\\s*\\n+","g"),"\n\n");a=a.replace(new RegExp("([\\s\\S]+?)\\n\\n","mg"),"$1
\n");a=a.replace(new RegExp("\\s*?
","gi"),"");a=a.replace(new RegExp("\\s*(?(?:"+b+")[^>]*>)\\s*
","gi"),"$1");a=a.replace(new RegExp("(
","gi"),"$1");a=a.replace(new RegExp("\\s*
]*)>","gi"),"");a=a.replace(new RegExp("
\\s*","gi"),"
");a=a.replace(new RegExp("\\s*(?(?:"+b+")[^>]*>)","gi"),"$1");a=a.replace(new RegExp("(?(?:"+b+")[^>]*>)\\s*
","gi"),"$1");a=a.replace(new RegExp("\\s*\\n","gi"),"
\n");a=a.replace(new RegExp("(?(?:"+b+")[^>]*>)\\s*
","gi"),"$1");a=a.replace(new RegExp("
(\\s*?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)","gi"),"$1");a=a.replace(new RegExp("(?:|
)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:
|
)*","gi"),"[caption$1[/caption]");a=a.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(c){c=c.replace(/
[\r\n]*/g,"\n");return c.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"\n")});return a}};
\ No newline at end of file
+var switchEditors={mode:"",I:function(a){return document.getElementById(a)},edInit:function(){var a=tinymce.util.Cookie.getHash("TinyMCE_content_size");if(getUserSetting("editor")=="html"){if(a){try{this.I("content").style.height=a.ch-30+"px"}catch(b){}}}else{try{this.I("quicktags").style.display="none"}catch(b){}tinyMCE.execCommand("mceAddControl",false,"content")}},saveCallback:function(b,c,a){if(tinyMCE.activeEditor.isHidden()){c=this.I(b).value}else{c=this.pre_wpautop(c)}return c},pre_wpautop:function(b){var c,a;b=b.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(d){d=d.replace(/
[\r\n]*/g,"");return d.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"")});c="blockquote|ul|ol|li|table|thead|tbody|tr|th|td|div|h[1-6]|p";b=b.replace(new RegExp("\\s*("+c+")>\\s*","mg"),"$1>\n");b=b.replace(new RegExp("\\s*<(("+c+")[^>]*)>","mg"),"\n<$1>");b=b.replace(new RegExp("(]+>.*?)
","mg"),"$1");b=b.replace(new RegExp("]*)>\\s*
","mgi"),"
\n\n");b=b.replace(new RegExp("\\s*
","mgi"),"");b=b.replace(new RegExp("\\s*
\\s*","mgi"),"\n\n");b=b.replace(new RegExp("\\n\\s*\\n","mgi"),"\n\n");b=b.replace(new RegExp("\\s*
\\s*","gi"),"\n");b=b.replace(new RegExp("\\s*
\\s*","mg"),"
\n");b=b.replace(new RegExp("\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*","gi"),"\n\n[caption$1[/caption]\n\n");b=b.replace(new RegExp("caption\\]\\n\\n+\\[caption","g"),"caption]\n\n[caption");a="blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre";b=b.replace(new RegExp("\\s*<(("+a+") ?[^>]*)\\s*>","mg"),"\n<$1>");b=b.replace(new RegExp("\\s*("+a+")>\\s*","mg"),"$1>\n");b=b.replace(new RegExp("
]*)>","g"),"\t");if(b.indexOf("/g,function(d){return d.replace(/[\r\n]+/g,"")})}b=b.replace(new RegExp("","g"),"\n");b=b.replace(new RegExp("\\s*(]+>.*
)","mg"),"\n$1");b=b.replace(new RegExp("^\\s*",""),"");b=b.replace(new RegExp("[\\s\\u00a0]*$",""),"");b=b.replace(//g,"\n");return b},go:function(g,e){g=g||"content";e=e||this.mode||"";var b=tinyMCE.get(g)||false,f=this.I("quicktags"),c=this.I("edButtonHTML"),d=this.I("edButtonPreview"),a=this.I(g);if("tinymce"==e){if(b&&!b.isHidden()){return false}this.mode="html";a.style.color="#fff";d.className="active";c.className="";edCloseAllTags();f.style.display="none";a.value=this.wpautop(a.value);if(b){b.show()}else{tinyMCE.execCommand("mceAddControl",false,g)}setUserSetting("editor","tinymce")}else{if(!b||b.isHidden()){return false}this.mode="tinymce";c.className="active";d.className="";a.style.height=b.getContentAreaContainer().offsetHeight+6+"px";b.hide();f.style.display="block";a.style.color="";setUserSetting("editor","html")}return false},wpautop:function(a){var b="table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]";if(a.indexOf("/g,function(c){return c.replace(/[\r\n]+/g,"")})}a=a.replace(/<[^<>]+>/g,function(c){return c.replace(/[\r\n]+/g," ")});a=a+"\n\n";a=a.replace(new RegExp("
\\s*
","gi"),"\n\n");a=a.replace(new RegExp("(<(?:"+b+")[^>]*>)","gi"),"\n$1");a=a.replace(new RegExp("((?:"+b+")>)","gi"),"$1\n\n");a=a.replace(new RegExp("\\r\\n|\\r","g"),"\n");a=a.replace(new RegExp("\\n\\s*\\n+","g"),"\n\n");a=a.replace(new RegExp("([\\s\\S]+?)\\n\\n","mg"),"$1
\n");a=a.replace(new RegExp("\\s*?
","gi"),"");a=a.replace(new RegExp("\\s*(?(?:"+b+")[^>]*>)\\s*
","gi"),"$1");a=a.replace(new RegExp("(
","gi"),"$1");a=a.replace(new RegExp("\\s*
]*)>","gi"),"");a=a.replace(new RegExp("
\\s*","gi"),"
");a=a.replace(new RegExp("\\s*(?(?:"+b+")[^>]*>)","gi"),"$1");a=a.replace(new RegExp("(?(?:"+b+")[^>]*>)\\s*
","gi"),"$1");a=a.replace(new RegExp("\\s*\\n","gi"),"
\n");a=a.replace(new RegExp("(?(?:"+b+")[^>]*>)\\s*
","gi"),"$1");a=a.replace(new RegExp("
(\\s*?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)","gi"),"$1");a=a.replace(new RegExp("(?:|
)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:
|
)*","gi"),"[caption$1[/caption]");a=a.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(c){c=c.replace(/
[\r\n]*/g,"\n");return c.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"\n")});return a}};
\ No newline at end of file
diff --git a/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm b/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
index a245bc34c9..e6ee31c95f 100644
--- a/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
+++ b/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
@@ -3,7 +3,7 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+