diff -r a4642baaf829 -r 4d4862461b8d web/wp-admin/js/editor.dev.js --- a/web/wp-admin/js/editor.dev.js Tue Feb 02 14:45:47 2010 +0000 +++ b/web/wp-admin/js/editor.dev.js Tue Feb 02 15:44:16 2010 +0000 @@ -1,179 +1,196 @@ - -jQuery(document).ready(function($){ - var h = wpCookies.getHash('TinyMCE_content_size'); - - if ( getUserSetting( 'editor' ) == 'html' ) { - if ( h ) - $('#content').css('height', h.ch - 15 + 'px'); - } else { - $('#content').css('color', 'white'); - $('#quicktags').hide(); - } -}); - -var switchEditors = { - - mode : '', - - I : function(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) { - var blocklist1, blocklist2; - - // Protect pre|script tags - content = content.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) { - a = a.replace(/[\r\n]*/g, ''); - return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, ''); - }); - - // Pretty it up for the source editor - blocklist1 = 'blockquote|ul|ol|li|table|thead|tbody|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+')[^>]*)>', 'mg'), '\n<$1>'); - - // Mark
]+>.*?)
- content = content.replace(new RegExp('
', 'mgi'), '
and - content = content.replace(new RegExp('\\s*
', 'mgi'), ''); - content = content.replace(new RegExp('\\s*
]+>.*
$1
\\s*?
\\s*(?(?:'+blocklist+')[^>]*>)\\s*
(
\\s*
]*)>', 'gi'), ""); - pee = pee.replace(new RegExp('\\s*', 'gi'), '
"); - pee = pee.replace(new RegExp('
\\s*(?(?:'+blocklist+')[^>]*>)', 'gi'), "$1"); - pee = pee.replace(new RegExp('(?(?:'+blocklist+')[^>]*>)\\s*
|)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:
]+>.*?)<\/p>/g, '$1
+ content = content.replace(/
/gi, '
and + content = content.replace(/\s*
/gi, ''); + content = content.replace(/\s*<\/p>\s*/gi, '\n\n'); + content = content.replace(/\n[\s\u00a0]+\n/g, '\n\n'); + content = content.replace(/\s*\s*/gi, '\n'); + + // Fix some block element newline issues + content = content.replace(/\s*
]+>[\s\S]*?<\/p>)/g, '\n$1'); + + // Trim whitespace + content = content.replace(/^\s+/, ''); + content = content.replace(/[\s\u00a0]+$/, ''); + + // put back the line breaks in pre|script + content = content.replace(//g, '\n'); + + return content; + }, + + go : function(id, mode) { + id = id || 'content'; + mode = mode || this.mode || ''; + + var ed, qt = this.I('quicktags'), H = this.I('edButtonHTML'), P = this.I('edButtonPreview'), ta = this.I(id); + + try { ed = tinyMCE.get(id); } + catch(e) { ed = false; } + + if ( 'tinymce' == mode ) { + if ( ed && ! ed.isHidden() ) + return false; + + setUserSetting( 'editor', 'tinymce' ); + this.mode = 'html'; + + P.className = 'active'; + H.className = ''; + edCloseAllTags(); // :-( + qt.style.display = 'none'; + + ta.style.color = '#FFF'; + ta.value = this.wpautop(ta.value); + + try { + if ( ed ) + ed.show(); + else + tinyMCE.execCommand("mceAddControl", false, id); + } catch(e) {} + + ta.style.color = '#000'; + } else { + setUserSetting( 'editor', 'html' ); + ta.style.color = '#000'; + this.mode = 'tinymce'; + H.className = 'active'; + P.className = ''; + + if ( ed && !ed.isHidden() ) { + ta.style.height = ed.getContentAreaContainer().offsetHeight + 24 + 'px'; + ed.hide(); + } + + qt.style.display = 'block'; + } + return false; + }, + + _wp_Autop : function(pee) { + var blocklist = '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]|fieldset|legend'; + + if ( pee.indexOf('/g, function(a){ + return a.replace(/[\r\n]+/g, ''); + }); + } + + pee = pee.replace(/<[^<>]+>/g, function(a){ + return a.replace(/[\r\n]+/g, ' '); + }); + + pee = pee + '\n\n'; + pee = pee.replace(/\s*/gi, '\n\n'); + pee = pee.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), '\n$1'); + pee = pee.replace(new RegExp('((?:'+blocklist+')>)', 'gi'), '$1\n\n'); + pee = pee.replace(/\r\n|\r/g, '\n'); + pee = pee.replace(/\n\s*\n+/g, '\n\n'); + pee = pee.replace(/([\s\S]+?)\n\n/g, '$1\n'); + pee = pee.replace(/\s*?<\/p>/gi, ''); + pee = pee.replace(new RegExp('\\s*(?(?:'+blocklist+')[^>]*>)\\s*', 'gi'), "$1"); + pee = pee.replace(/(/gi, '$1'); + pee = pee.replace(/\s*]*)>/gi, ''); + pee = pee.replace(/<\/blockquote>\s*<\/p>/gi, ''); + pee = pee.replace(new RegExp('\\s*(?(?:'+blocklist+')[^>]*>)', 'gi'), "$1"); + pee = pee.replace(new RegExp('(?(?:'+blocklist+')[^>]*>)\\s*', 'gi'), "$1"); + pee = pee.replace(/\s*\n/gi, '\n'); + pee = pee.replace(new RegExp('(?(?:'+blocklist+')[^>]*>)\\s*', 'gi'), "$1"); + pee = pee.replace(/(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1'); + pee = pee.replace(/(?:|)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|)*/gi, '[caption$1[/caption]'); + + pee = pee.replace(/(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function(a, b, c) { + if ( c.match(/]+)?>/) ) + return a; + + return b + '' + c + ''; + }); + + // Fix the pre|script tags + pee = pee.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) { + a = a.replace(/[\r\n]*/g, '\n'); + return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '\n'); + }); + + return pee; + }, + + pre_wpautop : function(content) { + var t = this, o = { o: t, data: content, unfiltered: content }; + + jQuery('body').trigger('beforePreWpautop', [o]); + o.data = t._wp_Nop(o.data); + jQuery('body').trigger('afterPreWpautop', [o]); + return o.data; + }, + + wpautop : function(pee) { + var t = this, o = { o: t, data: pee, unfiltered: pee }; + + jQuery('body').trigger('beforeWpautop', [o]); + o.data = t._wp_Autop(o.data); + jQuery('body').trigger('afterWpautop', [o]); + return o.data; + } +};
\s*?<\/p>/gi, ''); + pee = pee.replace(new RegExp('
\s*
]*)>/gi, ''); + pee = pee.replace(/<\/blockquote>\s*<\/p>/gi, ''); + pee = pee.replace(new RegExp('\\s*(?(?:'+blocklist+')[^>]*>)', 'gi'), "$1"); + pee = pee.replace(new RegExp('(?(?:'+blocklist+')[^>]*>)\\s*', 'gi'), "$1"); + pee = pee.replace(/\s*\n/gi, '\n'); + pee = pee.replace(new RegExp('(?(?:'+blocklist+')[^>]*>)\\s*', 'gi'), "$1"); + pee = pee.replace(/(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1'); + pee = pee.replace(/(?:|)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|)*/gi, '[caption$1[/caption]'); + + pee = pee.replace(/(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function(a, b, c) { + if ( c.match(/]+)?>/) ) + return a; + + return b + '' + c + ''; + }); + + // Fix the pre|script tags + pee = pee.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) { + a = a.replace(/[\r\n]*/g, '\n'); + return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '\n'); + }); + + return pee; + }, + + pre_wpautop : function(content) { + var t = this, o = { o: t, data: content, unfiltered: content }; + + jQuery('body').trigger('beforePreWpautop', [o]); + o.data = t._wp_Nop(o.data); + jQuery('body').trigger('afterPreWpautop', [o]); + return o.data; + }, + + wpautop : function(pee) { + var t = this, o = { o: t, data: pee, unfiltered: pee }; + + jQuery('body').trigger('beforeWpautop', [o]); + o.data = t._wp_Autop(o.data); + jQuery('body').trigger('afterWpautop', [o]); + return o.data; + } +};
'); + pee = pee.replace(/<\/blockquote>\s*<\/p>/gi, '
\\s*(?(?:'+blocklist+')[^>]*>)', 'gi'), "$1"); + pee = pee.replace(new RegExp('(?(?:'+blocklist+')[^>]*>)\\s*
|)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|)*/gi, '[caption$1[/caption]'); + + pee = pee.replace(/(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function(a, b, c) { + if ( c.match(/
]+)?>/) ) + return a; + + return b + '
' + c + '