containing
- content = content.replace(/]*)>\s*/gi, '\n\n');
+ content = content.replace(/]*)?>\s*/gi, '\n\n');
// Remove and
content = content.replace(/\s*
/gi, '');
@@ -55,10 +96,14 @@ var switchEditors = {
content = content.replace(/caption\]\n\n+\[caption/g, 'caption]\n\n[caption');
blocklist2 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset';
- content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'g'), '\n<$1>');
+ content = content.replace(new RegExp('\\s*<((?:'+blocklist2+')(?: [^>]*)?)\\s*>', 'g'), '\n<$1>');
content = content.replace(new RegExp('\\s*\\s*', 'g'), '\n');
content = content.replace(/]*)>/g, '\t');
+ if ( content.indexOf(']*)?>\s*/g, '\n\n\n\n');
+ }
+
if ( content.indexOf('/g, function(a){
return a.replace(/[\r\n]+/g, '');
@@ -79,57 +124,8 @@ var switchEditors = {
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';
+ var blocklist = 'table|thead|tfoot|tbody|tr|td|th|caption|col|colgroup|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]|fieldset|legend|hr|noscript|menu|samp|header|footer|article|section|hgroup|nav|aside|details|summary';
if ( pee.indexOf('/g, function(a){
@@ -141,56 +137,70 @@ var switchEditors = {
return a.replace(/[\r\n]+/g, ' ');
});
+ // Protect pre|script tags
+ if ( pee.indexOf(']*>[\s\S]+?<\/\1>/g, function(a) {
+ return a.replace(/(\r\n|\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'), '\n$1');
pee = pee.replace(new RegExp('()', 'gi'), '$1\n\n');
+ pee = pee.replace(/]*)?>/gi, '\n\n'); // hr is self closing block element
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*(]*>)\\s*
', 'gi'), "$1");
+ pee = pee.replace(new RegExp('\\s*(]*)?>)\\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*(]*>)', 'gi'), "$1");
- pee = pee.replace(new RegExp('(]*>)\\s*
', 'gi'), "$1");
+ pee = pee.replace(new RegExp('\\s*(]*)?>)', 'gi'), "$1");
+ pee = pee.replace(new RegExp('(]*)?>)\\s*
', 'gi'), "$1");
pee = pee.replace(/\s*\n/gi, '
\n');
pee = pee.replace(new RegExp('(]*>)\\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(/]+)?>/) )
+ 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');
- });
+ // put back the line breaks in pre|script
+ pee = pee.replace(//g, '\n');
return pee;
},
pre_wpautop : function(content) {
- var t = this, o = { o: t, data: content, unfiltered: content };
+ var t = this, o = { o: t, data: content, unfiltered: content },
+ q = typeof(jQuery) != 'undefined';
- jQuery('body').trigger('beforePreWpautop', [o]);
+ if ( q )
+ jQuery('body').trigger('beforePreWpautop', [o]);
o.data = t._wp_Nop(o.data);
- jQuery('body').trigger('afterPreWpautop', [o]);
+ if ( q )
+ jQuery('body').trigger('afterPreWpautop', [o]);
+
return o.data;
},
wpautop : function(pee) {
- var t = this, o = { o: t, data: pee, unfiltered: pee };
+ var t = this, o = { o: t, data: pee, unfiltered: pee },
+ q = typeof(jQuery) != 'undefined';
- jQuery('body').trigger('beforeWpautop', [o]);
+ if ( q )
+ jQuery('body').trigger('beforeWpautop', [o]);
o.data = t._wp_Autop(o.data);
- jQuery('body').trigger('afterWpautop', [o]);
+ if ( q )
+ jQuery('body').trigger('afterWpautop', [o]);
+
return o.data;
}
-};
+}
+