WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE 3.2.7 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-09-26 08:33:16 +00:00
parent 1e611d37da
commit ba74883676
30 changed files with 114 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/post.php
View File

@ -1370,7 +1370,9 @@ function wp_tiny_mce( $teeny = false ) {
'accessibility_focus' => true, 'accessibility_focus' => true,
'tabfocus_elements' => 'major-publishing-actions', 'tabfocus_elements' => 'major-publishing-actions',
'media_strict' => false, 'media_strict' => false,
'save_callback' => 'switchEditors.saveCallback', 'paste_remove_styles' => true,
'paste_remove_spans' => true,
'paste_strip_class_attributes' => 'all',
'wpeditimage_disable_captions' => $no_captions, 'wpeditimage_disable_captions' => $no_captions,
'plugins' => "$plugins" 'plugins' => "$plugins"
); );

93
wp-admin/js/editor.dev.js
View File

@ -6,8 +6,11 @@ jQuery(document).ready(function($){
if ( h ) if ( h )
$('#content').css('height', h.ch - 15 + 'px'); $('#content').css('height', h.ch - 15 + 'px');
} else { } else {
$('#content').css('color', 'white'); if ( typeof tinyMCE != 'object' ) {
$('#quicktags').hide(); $('#content').css('color', '#000');
} else {
$('#quicktags').hide();
}
} }
}); });
@ -19,19 +22,6 @@ var switchEditors = {
return document.getElementById(e); return document.getElementById(e);
}, },
edInit : function() {
},
saveCallback : function(el, content, body) {
if ( tinyMCE.activeEditor.isHidden() )
content = this.I(el).value;
else
content = this.pre_wpautop(content);
return content;
},
pre_wpautop : function(content) { pre_wpautop : function(content) {
var blocklist1, blocklist2; var blocklist1, blocklist2;
@ -41,33 +31,35 @@ var switchEditors = {
return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '<wp_temp>'); return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '<wp_temp>');
}); });
content = content.replace(/<p>[\s\u00a0]*<\/p>/g, '<wp_empty_p>');
// Pretty it up for the source editor // Pretty it up for the source editor
blocklist1 = 'blockquote|ul|ol|li|table|thead|tbody|tr|th|td|div|h[1-6]|p'; blocklist1 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p';
content = content.replace(new RegExp('\\s*</('+blocklist1+')>\\s*', 'mg'), '</$1>\n'); content = content.replace(new RegExp('\\s*</('+blocklist1+')>\\s*', 'g'), '</$1>\n');
content = content.replace(new RegExp('\\s*<(('+blocklist1+')[^>]*)>', 'mg'), '\n<$1>'); content = content.replace(new RegExp('\\s*<(('+blocklist1+')[^>]*)>', 'g'), '\n<$1>');
// Mark </p> if it has any attributes. // Mark </p> if it has any attributes.
content = content.replace(new RegExp('(<p [^>]+>.*?)</p>', 'mg'), '$1</p#>'); content = content.replace(/(<p [^>]+>.*?)<\/p>/g, '$1</p#>');
// Sepatate <div> containing <p> // Sepatate <div> containing <p>
content = content.replace(new RegExp('<div([^>]*)>\\s*<p>', 'mgi'), '<div$1>\n\n'); content = content.replace(/<div([^>]*)>\s*<p>/gi, '<div$1>\n\n');
// Remove <p> and <br /> // Remove <p> and <br />
content = content.replace(new RegExp('\\s*<p>', 'mgi'), ''); content = content.replace(/\s*<p>/gi, '');
content = content.replace(new RegExp('\\s*</p>\\s*', 'mgi'), '\n\n'); content = content.replace(/\s*<\/p>\s*/gi, '\n\n');
content = content.replace(new RegExp('\\n\\s*\\n', 'mgi'), '\n\n'); content = content.replace(/\n[\s\u00a0]+\n/g, '\n\n');
content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'gi'), '\n'); content = content.replace(/\s*<br ?\/?>\s*/gi, '\n');
// Fix some block element newline issues // Fix some block element newline issues
content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div'); content = content.replace(/\s*<div/g, '\n<div');
content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n'); content = content.replace(/<\/div>\s*/g, '</div>\n');
content = content.replace(new RegExp('\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*', 'gi'), '\n\n[caption$1[/caption]\n\n'); content = content.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi, '\n\n[caption$1[/caption]\n\n');
content = content.replace(new RegExp('caption\\]\\n\\n+\\[caption', 'g'), 'caption]\n\n[caption'); content = content.replace(/caption\]\n\n+\[caption/g, 'caption]\n\n[caption');
blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre'; blocklist2 = 'blockquote|ul|ol|li|table|thead|tfoot|tr|th|td|h[1-6]|pre';
content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'mg'), '\n<$1>'); content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'g'), '\n<$1>');
content = content.replace(new RegExp('\\s*</('+blocklist2+')>\\s*', 'mg'), '</$1>\n'); content = content.replace(new RegExp('\\s*</('+blocklist2+')>\\s*', 'g'), '</$1>\n');
content = content.replace(new RegExp('<li([^>]*)>', 'g'), '\t<li$1>'); content = content.replace(/<li([^>]*)>/g, '\t<li$1>');
if ( content.indexOf('<object') != -1 ) { if ( content.indexOf('<object') != -1 ) {
content = content.replace(/<object[\s\S]+?<\/object>/g, function(a){ content = content.replace(/<object[\s\S]+?<\/object>/g, function(a){
@ -76,15 +68,16 @@ var switchEditors = {
} }
// Unmark special paragraph closing tags // Unmark special paragraph closing tags
content = content.replace(new RegExp('</p#>', 'g'), '</p>\n'); content = content.replace(/<\/p#>/g, '</p>\n');
content = content.replace(new RegExp('\\s*(<p [^>]+>.*</p>)', 'mg'), '\n$1'); content = content.replace(/\s*(<p [^>]+>[\s\S]*?<\/p>)/g, '\n$1');
// Trim whitespace // Trim whitespace
content = content.replace(new RegExp('^\\s*', ''), ''); content = content.replace(/^\s+/, '');
content = content.replace(new RegExp('[\\s\\u00a0]*$', ''), ''); content = content.replace(/[\s\u00a0]+$/, '');
// put back the line breaks in pre|script // put back the line breaks in pre|script
content = content.replace(/<wp_temp>/g, '\n'); content = content.replace(/<wp_temp>/g, '\n');
content = content.replace(/<wp_empty_p>\s*/g, '<p>&nbsp;</p>\n\n');
// Hope. // Hope.
return content; return content;
@ -149,24 +142,24 @@ var switchEditors = {
return a.replace(/[\r\n]+/g, ' '); return a.replace(/[\r\n]+/g, ' ');
}); });
pee = pee + "\n\n"; pee = pee + '\n\n';
pee = pee.replace(new RegExp('<br />\\s*<br />', 'gi'), "\n\n"); pee = pee.replace(/<br \/>\s*<br \/>/gi, '\n\n');
pee = pee.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), "\n$1"); pee = pee.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), '\n$1');
pee = pee.replace(new RegExp('(</(?:'+blocklist+')>)', 'gi'), "$1\n\n"); pee = pee.replace(new RegExp('(</(?:'+blocklist+')>)', 'gi'), '$1\n\n');
pee = pee.replace(new RegExp("\\r\\n|\\r", 'g'), "\n"); pee = pee.replace(/\r\n|\r/g, '\n');
pee = pee.replace(new RegExp("\\n\\s*\\n+", 'g'), "\n\n"); pee = pee.replace(/\n\s*\n+/g, '\n\n');
pee = pee.replace(new RegExp('([\\s\\S]+?)\\n\\n', 'mg'), "<p>$1</p>\n"); pee = pee.replace(/([\s\S]+?)\n\n/g, '<p>$1</p>\n');
pee = pee.replace(new RegExp('<p>\\s*?</p>', 'gi'), ''); pee = pee.replace(/<p>\s*?<\/p>/gi, '');
pee = pee.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1"); pee = pee.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
pee = pee.replace(new RegExp("<p>(<li.+?)</p>", 'gi'), "$1"); pee = pee.replace(/<p>(<li.+?)<\/p>/gi, '$1');
pee = pee.replace(new RegExp('<p>\\s*<blockquote([^>]*)>', 'gi'), "<blockquote$1><p>"); pee = pee.replace(/<p>\s*<blockquote([^>]*)>/gi, '<blockquote$1><p>');
pee = pee.replace(new RegExp('</blockquote>\\s*</p>', 'gi'), '</p></blockquote>'); pee = pee.replace(/<\/blockquote>\s*<\/p>/gi, '</p></blockquote>');
pee = pee.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)', 'gi'), "$1"); pee = pee.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)', 'gi'), "$1");
pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1"); pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
pee = pee.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n"); pee = pee.replace(/\s*\n/gi, '<br />\n');
pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1"); pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1");
pee = pee.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1'); pee = pee.replace(/<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1');
pee = pee.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[caption$1[/caption]'); pee = pee.replace(/(?:<p>|<br ?\/?>)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|<br ?\/?>)*/gi, '[caption$1[/caption]');
// Fix the pre|script tags // Fix the pre|script tags
pee = pee.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) { pee = pee.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) {

2
wp-admin/js/editor.js
View File

@ -1 +1 @@
jQuery(document).ready(function(b){var a=wpCookies.getHash("TinyMCE_content_size");if(getUserSetting("editor")=="html"){if(a){b("#content").css("height",a.ch-15+"px")}}else{b("#content").css("color","white");b("#quicktags").hide()}});var switchEditors={mode:"",I:function(a){return document.getElementById(a)},edInit:function(){},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(/<br ?\/?>[\r\n]*/g,"<wp_temp>");return d.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"<wp_temp>")});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("(<p [^>]+>.*?)</p>","mg"),"$1</p#>");b=b.replace(new RegExp("<div([^>]*)>\\s*<p>","mgi"),"<div$1>\n\n");b=b.replace(new RegExp("\\s*<p>","mgi"),"");b=b.replace(new RegExp("\\s*</p>\\s*","mgi"),"\n\n");b=b.replace(new RegExp("\\n\\s*\\n","mgi"),"\n\n");b=b.replace(new RegExp("\\s*<br ?/?>\\s*","gi"),"\n");b=b.replace(new RegExp("\\s*<div","mg"),"\n<div");b=b.replace(new RegExp("</div>\\s*","mg"),"</div>\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("<li([^>]*)>","g"),"\t<li$1>");if(b.indexOf("<object")!=-1){b=b.replace(/<object[\s\S]+?<\/object>/g,function(d){return d.replace(/[\r\n]+/g,"")})}b=b.replace(new RegExp("</p#>","g"),"</p>\n");b=b.replace(new RegExp("\\s*(<p [^>]+>.*</p>)","mg"),"\n$1");b=b.replace(new RegExp("^\\s*",""),"");b=b.replace(new RegExp("[\\s\\u00a0]*$",""),"");b=b.replace(/<wp_temp>/g,"\n");return b},go:function(i,g){i=i||"content";g=g||this.mode||"";var b,h=this.I("quicktags"),c=this.I("edButtonHTML"),d=this.I("edButtonPreview"),a=this.I(i);try{b=tinyMCE.get(i)}catch(f){b=false}if("tinymce"==g){if(b&&!b.isHidden()){return false}setUserSetting("editor","tinymce");this.mode="html";d.className="active";c.className="";edCloseAllTags();h.style.display="none";a.value=this.wpautop(a.value);if(b){b.show()}else{try{tinyMCE.execCommand("mceAddControl",false,i)}catch(f){}}}else{setUserSetting("editor","html");a.style.color="#000";this.mode="tinymce";c.className="active";d.className="";if(b&&!b.isHidden()){a.style.height=b.getContentAreaContainer().offsetHeight+24+"px";b.hide()}h.style.display="block"}return false},wpautop:function(a){var b="table|thead|tfoot|caption|col|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("<object")!=-1){a=a.replace(/<object[\s\S]+?<\/object>/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("<br />\\s*<br />","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"),"<p>$1</p>\n");a=a.replace(new RegExp("<p>\\s*?</p>","gi"),"");a=a.replace(new RegExp("<p>\\s*(</?(?:"+b+")[^>]*>)\\s*</p>","gi"),"$1");a=a.replace(new RegExp("<p>(<li.+?)</p>","gi"),"$1");a=a.replace(new RegExp("<p>\\s*<blockquote([^>]*)>","gi"),"<blockquote$1><p>");a=a.replace(new RegExp("</blockquote>\\s*</p>","gi"),"</p></blockquote>");a=a.replace(new RegExp("<p>\\s*(</?(?:"+b+")[^>]*>)","gi"),"$1");a=a.replace(new RegExp("(</?(?:"+b+")[^>]*>)\\s*</p>","gi"),"$1");a=a.replace(new RegExp("\\s*\\n","gi"),"<br />\n");a=a.replace(new RegExp("(</?(?:"+b+")[^>]*>)\\s*<br />","gi"),"$1");a=a.replace(new RegExp("<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)","gi"),"$1");a=a.replace(new RegExp("(?:<p>|<br ?/?>)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:</p>|<br ?/?>)*","gi"),"[caption$1[/caption]");a=a.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(c){c=c.replace(/<br ?\/?>[\r\n]*/g,"\n");return c.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"\n")});return a}}; jQuery(document).ready(function(b){var a=wpCookies.getHash("TinyMCE_content_size");if(getUserSetting("editor")=="html"){if(a){b("#content").css("height",a.ch-15+"px")}}else{if(typeof tinyMCE!="object"){b("#content").css("color","#000")}else{b("#quicktags").hide()}}});var switchEditors={mode:"",I:function(a){return document.getElementById(a)},pre_wpautop:function(b){var c,a;b=b.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(d){d=d.replace(/<br ?\/?>[\r\n]*/g,"<wp_temp>");return d.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"<wp_temp>")});b=b.replace(/<p>[\s\u00a0]*<\/p>/g,"<wp_empty_p>");c="blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p";b=b.replace(new RegExp("\\s*</("+c+")>\\s*","g"),"</$1>\n");b=b.replace(new RegExp("\\s*<(("+c+")[^>]*)>","g"),"\n<$1>");b=b.replace(/(<p [^>]+>.*?)<\/p>/g,"$1</p#>");b=b.replace(/<div([^>]*)>\s*<p>/gi,"<div$1>\n\n");b=b.replace(/\s*<p>/gi,"");b=b.replace(/\s*<\/p>\s*/gi,"\n\n");b=b.replace(/\n[\s\u00a0]+\n/g,"\n\n");b=b.replace(/\s*<br ?\/?>\s*/gi,"\n");b=b.replace(/\s*<div/g,"\n<div");b=b.replace(/<\/div>\s*/g,"</div>\n");b=b.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi,"\n\n[caption$1[/caption]\n\n");b=b.replace(/caption\]\n\n+\[caption/g,"caption]\n\n[caption");a="blockquote|ul|ol|li|table|thead|tfoot|tr|th|td|h[1-6]|pre";b=b.replace(new RegExp("\\s*<(("+a+") ?[^>]*)\\s*>","g"),"\n<$1>");b=b.replace(new RegExp("\\s*</("+a+")>\\s*","g"),"</$1>\n");b=b.replace(/<li([^>]*)>/g,"\t<li$1>");if(b.indexOf("<object")!=-1){b=b.replace(/<object[\s\S]+?<\/object>/g,function(d){return d.replace(/[\r\n]+/g,"")})}b=b.replace(/<\/p#>/g,"</p>\n");b=b.replace(/\s*(<p [^>]+>[\s\S]*?<\/p>)/g,"\n$1");b=b.replace(/^\s+/,"");b=b.replace(/[\s\u00a0]+$/,"");b=b.replace(/<wp_temp>/g,"\n");b=b.replace(/<wp_empty_p>\s*/g,"<p>&nbsp;</p>\n\n");return b},go:function(i,g){i=i||"content";g=g||this.mode||"";var b,h=this.I("quicktags"),c=this.I("edButtonHTML"),d=this.I("edButtonPreview"),a=this.I(i);try{b=tinyMCE.get(i)}catch(f){b=false}if("tinymce"==g){if(b&&!b.isHidden()){return false}setUserSetting("editor","tinymce");this.mode="html";d.className="active";c.className="";edCloseAllTags();h.style.display="none";a.value=this.wpautop(a.value);if(b){b.show()}else{try{tinyMCE.execCommand("mceAddControl",false,i)}catch(f){}}}else{setUserSetting("editor","html");a.style.color="#000";this.mode="tinymce";c.className="active";d.className="";if(b&&!b.isHidden()){a.style.height=b.getContentAreaContainer().offsetHeight+24+"px";b.hide()}h.style.display="block"}return false},wpautop:function(a){var b="table|thead|tfoot|caption|col|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("<object")!=-1){a=a.replace(/<object[\s\S]+?<\/object>/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(/<br \/>\s*<br \/>/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(/\r\n|\r/g,"\n");a=a.replace(/\n\s*\n+/g,"\n\n");a=a.replace(/([\s\S]+?)\n\n/g,"<p>$1</p>\n");a=a.replace(/<p>\s*?<\/p>/gi,"");a=a.replace(new RegExp("<p>\\s*(</?(?:"+b+")[^>]*>)\\s*</p>","gi"),"$1");a=a.replace(/<p>(<li.+?)<\/p>/gi,"$1");a=a.replace(/<p>\s*<blockquote([^>]*)>/gi,"<blockquote$1><p>");a=a.replace(/<\/blockquote>\s*<\/p>/gi,"</p></blockquote>");a=a.replace(new RegExp("<p>\\s*(</?(?:"+b+")[^>]*>)","gi"),"$1");a=a.replace(new RegExp("(</?(?:"+b+")[^>]*>)\\s*</p>","gi"),"$1");a=a.replace(/\s*\n/gi,"<br />\n");a=a.replace(new RegExp("(</?(?:"+b+")[^>]*>)\\s*<br />","gi"),"$1");a=a.replace(/<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi,"$1");a=a.replace(/(?:<p>|<br ?\/?>)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|<br ?\/?>)*/gi,"[caption$1[/caption]");a=a.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g,function(c){c=c.replace(/<br ?\/?>[\r\n]*/g,"\n");return c.replace(/<\/?p( [^>]*)?>[\r\n]*/g,"\n")});return a}};

2
wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
View File

@ -3,7 +3,7 @@
<head> <head>
<title></title> <title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<script type="text/javascript" src="../../tiny_mce.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce.js?ver=327-1235"></script>
<script type="text/javascript"> <script type="text/javascript">
function patchCallback(settings, key) { function patchCallback(settings, key) {
if (settings[key]) if (settings[key])

2
wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/tinymce/plugins/inlinepopups/template.htm
View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>Template for dialogs</title> <title>Template for dialogs</title>
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=3241-1141" /> <link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=327-1235" />
</head> </head>
<body> <body>

2
wp-includes/js/tinymce/plugins/media/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

14
wp-includes/js/tinymce/plugins/media/media.htm
View File

@ -2,13 +2,13 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#media_dlg.title}</title> <title>{#media_dlg.title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="js/media.js?ver=3241-1141"></script> <script type="text/javascript" src="js/media.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/validate.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/editable_selects.js?ver=327-1235"></script>
<link href="css/media.css?ver=3241-1141" rel="stylesheet" type="text/css" /> <link href="css/media.css?ver=327-1235" rel="stylesheet" type="text/css" />
</head> </head>
<body style="display: none"> <body style="display: none">
<form onsubmit="insertMedia();return false;" action="#"> <form onsubmit="insertMedia();return false;" action="#">

2
wp-includes/js/tinymce/plugins/paste/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/tinymce/plugins/paste/js/pastetext.js
View File

@ -19,7 +19,7 @@ var PasteTextDialog = {
} }
} }
tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h); tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h});
tinyMCEPopup.close(); tinyMCEPopup.close();
}, },

4
wp-includes/js/tinymce/plugins/paste/js/pasteword.js
View File

@ -13,7 +13,7 @@ var PasteWordDialog = {
css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")]; css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")];
css = css.concat(tinymce.explode(ed.settings.content_css) || []); css = css.concat(tinymce.explode(ed.settings.content_css) || []);
tinymce.each(css, function(u) { tinymce.each(css, function(u) {
cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />'; cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute('' + u) + '" rel="stylesheet" type="text/css" />';
}); });
// Write content into iframe // Write content into iframe
@ -32,7 +32,7 @@ var PasteWordDialog = {
insert : function() { insert : function() {
var h = document.getElementById('iframe').contentWindow.document.body.innerHTML; var h = document.getElementById('iframe').contentWindow.document.body.innerHTML;
tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, h); tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h, wordContent : true});
tinyMCEPopup.close(); tinyMCEPopup.close();
}, },

6
wp-includes/js/tinymce/plugins/paste/pastetext.htm
View File

@ -2,8 +2,8 @@
<head> <head>
<title>{#paste.paste_text_desc}</title> <title>{#paste.paste_text_desc}</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="js/pastetext.js?ver=3241-1141"></script> <script type="text/javascript" src="js/pastetext.js?ver=327-1235"></script>
</head> </head>
<body onresize="PasteTextDialog.resize();" style="display:none; overflow:hidden;"> <body onresize="PasteTextDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteTextDialog.insert();" action="#"> <form name="source" onsubmit="return PasteTextDialog.insert();" action="#">
@ -30,4 +30,4 @@
</div> </div>
</form> </form>
</body> </body>
</html> </html>

4
wp-includes/js/tinymce/plugins/paste/pasteword.htm
View File

@ -2,8 +2,8 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>{#paste.paste_word_desc}</title> <title>{#paste.paste_word_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="js/pasteword.js?ver=3241-1141"></script> <script type="text/javascript" src="js/pasteword.js?ver=327-1235"></script>
</head> </head>
<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;"> <body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteWordDialog.insert();" action="#"> <form name="source" onsubmit="return PasteWordDialog.insert();" action="#">

9
wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js
View File

@ -161,6 +161,15 @@
}); });
}; };
ed.onSaveContent.add(function(ed, o) {
if ( typeof(switchEditors) == 'object' ) {
if ( ed.isHidden() )
o.content = o.element.value;
else
o.content = switchEditors.pre_wpautop(o.content);
}
});
// Add listeners to handle more break // Add listeners to handle more break
t._handleMoreBreak(ed, url); t._handleMoreBreak(ed, url);

2
wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

6
wp-includes/js/tinymce/themes/advanced/about.htm
View File

@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.about_title}</title> <title>{#advanced_dlg.about_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=327-1235"></script>
<script type="text/javascript" src="js/about.js?ver=3241-1141"></script> <script type="text/javascript" src="js/about.js?ver=327-1235"></script>
</head> </head>
<body id="about" style="display: none"> <body id="about" style="display: none">
<div class="tabs"> <div class="tabs">

4
wp-includes/js/tinymce/themes/advanced/anchor.htm
View File

@ -2,8 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.anchor_title}</title> <title>{#advanced_dlg.anchor_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="js/anchor.js?ver=3241-1141"></script> <script type="text/javascript" src="js/anchor.js?ver=327-1235"></script>
</head> </head>
<body style="display: none"> <body style="display: none">
<form onsubmit="AnchorDialog.update();return false;" action="#"> <form onsubmit="AnchorDialog.update();return false;" action="#">

4
wp-includes/js/tinymce/themes/advanced/charmap.htm
View File

@ -3,8 +3,8 @@
<head> <head>
<title>{#advanced_dlg.charmap_title}</title> <title>{#advanced_dlg.charmap_title}</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="js/charmap.js?ver=3241-1141"></script> <script type="text/javascript" src="js/charmap.js?ver=327-1235"></script>
</head> </head>
<body id="charmap" style="display:none"> <body id="charmap" style="display:none">
<table align="center" border="0" cellspacing="0" cellpadding="2"> <table align="center" border="0" cellspacing="0" cellpadding="2">

8
wp-includes/js/tinymce/themes/advanced/color_picker.htm
View File

@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.colorpicker_title}</title> <title>{#advanced_dlg.colorpicker_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=327-1235"></script>
<script type="text/javascript" src="js/color_picker.js?ver=3241-1141"></script> <script type="text/javascript" src="js/color_picker.js?ver=327-1235"></script>
</head> </head>
<body id="colorpicker" style="display: none"> <body id="colorpicker" style="display: none">
<form onsubmit="insertAction();return false" action="#"> <form onsubmit="insertAction();return false" action="#">
@ -21,7 +21,7 @@
<fieldset> <fieldset>
<legend>{#advanced_dlg.colorpicker_picker_title}</legend> <legend>{#advanced_dlg.colorpicker_picker_title}</legend>
<div id="picker"> <div id="picker">
<img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" alt=" " /> <img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" alt="" />
<div id="light"> <div id="light">
<!-- Will be filled with divs --> <!-- Will be filled with divs -->

8
wp-includes/js/tinymce/themes/advanced/image.htm
View File

@ -2,10 +2,10 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.image_title}</title> <title>{#advanced_dlg.image_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=327-1235"></script>
<script type="text/javascript" src="js/image.js?ver=3241-1141"></script> <script type="text/javascript" src="js/image.js?ver=327-1235"></script>
</head> </head>
<body id="image" style="display: none"> <body id="image" style="display: none">
<form onsubmit="ImageDialog.update();return false;" action="#"> <form onsubmit="ImageDialog.update();return false;" action="#">

8
wp-includes/js/tinymce/themes/advanced/js/link.js
View File

@ -63,8 +63,8 @@ var LinkDialog = {
ed.dom.setAttribs(e, { ed.dom.setAttribs(e, {
href : f.href.value, href : f.href.value,
title : f.linktitle.value, title : f.linktitle.value,
target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null, target : f.target_list ? getSelectValue(f, "target_list") : null,
'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null 'class' : f.class_list ? getSelectValue(f, "class_list") : null
}); });
} }
}); });
@ -72,8 +72,8 @@ var LinkDialog = {
ed.dom.setAttribs(e, { ed.dom.setAttribs(e, {
href : f.href.value, href : f.href.value,
title : f.linktitle.value, title : f.linktitle.value,
target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null, target : f.target_list ? getSelectValue(f, "target_list") : null,
'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null 'class' : f.class_list ? getSelectValue(f, "class_list") : null
}); });
} }

10
wp-includes/js/tinymce/themes/advanced/link.htm
View File

@ -2,11 +2,11 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.link_title}</title> <title>{#advanced_dlg.link_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=327-1235"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=3241-1141"></script> <script type="text/javascript" src="../../utils/validate.js?ver=327-1235"></script>
<script type="text/javascript" src="js/link.js?ver=3241-1141"></script> <script type="text/javascript" src="js/link.js?ver=327-1235"></script>
</head> </head>
<body id="link" style="display: none"> <body id="link" style="display: none">
<form onsubmit="LinkDialog.update();return false;" action="#"> <form onsubmit="LinkDialog.update();return false;" action="#">

4
wp-includes/js/tinymce/themes/advanced/source_editor.htm
View File

@ -2,8 +2,8 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>{#advanced_dlg.code_title}</title> <title>{#advanced_dlg.code_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3241-1141"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=327-1235"></script>
<script type="text/javascript" src="js/source_editor.js?ver=3241-1141"></script> <script type="text/javascript" src="js/source_editor.js?ver=327-1235"></script>
</head> </head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;"> <body onresize="resizeInputs();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="saveContent();return false;" action="#"> <form name="source" onsubmit="saveContent();return false;" action="#">

2
wp-includes/js/tinymce/tiny_mce.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/tinymce/tiny_mce_popup.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/tinymce/utils/form_utils.js
View File

@ -1,5 +1,5 @@
/** /**
* $Id: form_utils.js 996 2009-02-06 17:32:20Z spocke $ * $Id: form_utils.js 1184 2009-08-11 11:47:27Z spocke $
* *
* Various form utilitiy functions. * Various form utilitiy functions.
* *
@ -92,7 +92,7 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
function getSelectValue(form_obj, field_name) { function getSelectValue(form_obj, field_name) {
var elm = form_obj.elements[field_name]; var elm = form_obj.elements[field_name];
if (elm == null || elm.options == null) if (elm == null || elm.options == null || elm.selectedIndex === -1)
return ""; return "";
return elm.options[elm.selectedIndex].value; return elm.options[elm.selectedIndex].value;

10
wp-includes/js/tinymce/wp-tinymce.js
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/script-loader.php
View File

@ -86,7 +86,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' ); $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", false, '20090503' ); $scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", false, '20090925' );
$scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6'); $scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');

2
wp-includes/version.php
View File

@ -22,7 +22,7 @@ $wp_db_version = 11958;
* *
* @global string $tinymce_version * @global string $tinymce_version
*/ */
$tinymce_version = '3241-1141'; $tinymce_version = '327-1235';
/** /**
* Holds the cache manifest version * Holds the cache manifest version