JSHint fixes for editor.js. Props dougwollison, fixes #25947
git-svn-id: https://develop.svn.wordpress.org/trunk@26224 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
parent
5a8835f000
commit
961a2a89e9
|
|
@ -1,37 +1,48 @@
|
|||
/* global tinymce, tinyMCEPreInit, QTags, setUserSetting */
|
||||
|
||||
var switchEditors = {
|
||||
window.switchEditors = {
|
||||
|
||||
switchto: function( el ) {
|
||||
var aid = el.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4);
|
||||
var aid = el.id,
|
||||
l = aid.length,
|
||||
id = aid.substr( 0, l - 5 ),
|
||||
mode = aid.substr( l - 4 );
|
||||
|
||||
this.go( id, mode );
|
||||
},
|
||||
|
||||
go: function(id, mode) { // mode can be 'html', 'tmce', or 'toggle'; 'html' is used for the "Text" editor tab.
|
||||
// mode can be 'html', 'tmce', or 'toggle'; 'html' is used for the 'Text' editor tab.
|
||||
go: function( id, mode ) {
|
||||
var t = this, ed, wrap_id, txtarea_el,
|
||||
dom = tinymce.DOM;
|
||||
|
||||
id = id || 'content';
|
||||
mode = mode || 'toggle';
|
||||
|
||||
var t = this, ed = tinyMCE.get(id), wrap_id, txtarea_el, dom = tinymce.DOM;
|
||||
|
||||
ed = tinymce.get( id );
|
||||
wrap_id = 'wp-' + id + '-wrap';
|
||||
txtarea_el = dom.get( id );
|
||||
|
||||
if ( 'toggle' == mode ) {
|
||||
if ( ed && !ed.isHidden() )
|
||||
if ( 'toggle' === mode ) {
|
||||
if ( ed && ! ed.isHidden() ) {
|
||||
mode = 'html';
|
||||
else
|
||||
} else {
|
||||
mode = 'tmce';
|
||||
}
|
||||
}
|
||||
|
||||
if ( 'tmce' == mode || 'tinymce' == mode ) {
|
||||
if ( ed && ! ed.isHidden() )
|
||||
if ( 'tmce' === mode || 'tinymce' === mode ) {
|
||||
if ( ed && ! ed.isHidden() ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( typeof(QTags) != 'undefined' )
|
||||
if ( typeof( QTags ) !== 'undefined' ) {
|
||||
QTags.closeAllTags( id );
|
||||
}
|
||||
|
||||
if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop )
|
||||
if ( tinyMCEPreInit.mceInit[ id ] && tinyMCEPreInit.mceInit[ id ].wpautop ) {
|
||||
txtarea_el.value = t.wpautop( txtarea_el.value );
|
||||
}
|
||||
|
||||
if ( ed ) {
|
||||
ed.show();
|
||||
|
|
@ -44,17 +55,19 @@ var switchEditors = {
|
|||
dom.addClass( wrap_id, 'tmce-active' );
|
||||
setUserSetting( 'editor', 'tinymce' );
|
||||
|
||||
} else if ( 'html' == mode ) {
|
||||
} else if ( 'html' === mode ) {
|
||||
|
||||
if ( ed && ed.isHidden() )
|
||||
if ( ed && ed.isHidden() ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ( ed ) {
|
||||
ed.hide();
|
||||
} else {
|
||||
// The TinyMCE instance doesn't exist, run the content through "pre_wpautop()" and show the textarea
|
||||
if ( tinyMCEPreInit.mceInit[id] && tinyMCEPreInit.mceInit[id].wpautop )
|
||||
// The TinyMCE instance doesn't exist, run the content through 'pre_wpautop()' and show the textarea
|
||||
if ( tinyMCEPreInit.mceInit[ id ] && tinyMCEPreInit.mceInit[ id ].wpautop ) {
|
||||
txtarea_el.value = t.pre_wpautop( txtarea_el.value );
|
||||
}
|
||||
|
||||
dom.setStyles( txtarea_el, {'display': '', 'visibility': ''} );
|
||||
}
|
||||
|
|
@ -67,10 +80,12 @@ var switchEditors = {
|
|||
},
|
||||
|
||||
_wp_Nop: function( content ) {
|
||||
var blocklist1, blocklist2, preserve_linebreaks = false, preserve_br = false;
|
||||
var blocklist1, blocklist2,
|
||||
preserve_linebreaks = false,
|
||||
preserve_br = false;
|
||||
|
||||
// Protect pre|script tags
|
||||
if ( content.indexOf('<pre') != -1 || content.indexOf('<script') != -1 ) {
|
||||
if ( content.indexOf( '<pre' ) !== -1 || content.indexOf( '<script' ) !== -1 ) {
|
||||
preserve_linebreaks = true;
|
||||
content = content.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
|
||||
a = a.replace( /<br ?\/?>(\r\n|\n)?/g, '<wp-temp-lb>' );
|
||||
|
|
@ -79,7 +94,7 @@ var switchEditors = {
|
|||
}
|
||||
|
||||
// keep <br> tags inside captions and remove line breaks
|
||||
if ( content.indexOf('[caption') != -1 ) {
|
||||
if ( content.indexOf( '[caption' ) !== -1 ) {
|
||||
preserve_br = true;
|
||||
content = content.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
|
||||
return a.replace( /<br([^>]*)>/g, '<wp-temp-br$1>' ).replace( /[\r\n\t]+/, '' );
|
||||
|
|
@ -114,11 +129,11 @@ var switchEditors = {
|
|||
content = content.replace( new RegExp('\\s*</(' + blocklist2 + ')>\\s*', 'g' ), '</$1>\n' );
|
||||
content = content.replace( /<li([^>]*)>/g, '\t<li$1>' );
|
||||
|
||||
if ( content.indexOf('<hr') != -1 ) {
|
||||
if ( content.indexOf( '<hr' ) !== -1 ) {
|
||||
content = content.replace( /\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n' );
|
||||
}
|
||||
|
||||
if ( content.indexOf('<object') != -1 ) {
|
||||
if ( content.indexOf( '<object' ) !== -1 ) {
|
||||
content = content.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
|
||||
return a.replace( /[\r\n]+/g, '' );
|
||||
});
|
||||
|
|
@ -133,21 +148,26 @@ var switchEditors = {
|
|||
content = content.replace( /[\s\u00a0]+$/, '' );
|
||||
|
||||
// put back the line breaks in pre|script
|
||||
if ( preserve_linebreaks )
|
||||
if ( preserve_linebreaks ) {
|
||||
content = content.replace( /<wp-temp-lb>/g, '\n' );
|
||||
}
|
||||
|
||||
// and the <br> tags in captions
|
||||
if ( preserve_br )
|
||||
if ( preserve_br ) {
|
||||
content = content.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
|
||||
}
|
||||
|
||||
return content;
|
||||
},
|
||||
|
||||
_wp_Autop: function(pee) {
|
||||
var preserve_linebreaks = false, preserve_br = false,
|
||||
blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
|
||||
var preserve_linebreaks = false,
|
||||
preserve_br = false,
|
||||
blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select' +
|
||||
'|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section' +
|
||||
'|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
|
||||
|
||||
if ( pee.indexOf('<object') != -1 ) {
|
||||
if ( pee.indexOf( '<object' ) !== -1 ) {
|
||||
pee = pee.replace( /<object[\s\S]+?<\/object>/g, function( a ) {
|
||||
return a.replace( /[\r\n]+/g, '' );
|
||||
});
|
||||
|
|
@ -158,7 +178,7 @@ var switchEditors = {
|
|||
});
|
||||
|
||||
// Protect pre|script tags
|
||||
if ( pee.indexOf('<pre') != -1 || pee.indexOf('<script') != -1 ) {
|
||||
if ( pee.indexOf( '<pre' ) !== -1 || pee.indexOf( '<script' ) !== -1 ) {
|
||||
preserve_linebreaks = true;
|
||||
pee = pee.replace( /<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function( a ) {
|
||||
return a.replace( /(\r\n|\n)/g, '<wp-temp-lb>' );
|
||||
|
|
@ -166,7 +186,7 @@ var switchEditors = {
|
|||
}
|
||||
|
||||
// keep <br> tags inside captions and convert line breaks
|
||||
if ( pee.indexOf('[caption') != -1 ) {
|
||||
if ( pee.indexOf( '[caption' ) !== -1 ) {
|
||||
preserve_br = true;
|
||||
pee = pee.replace( /\[caption[\s\S]+?\[\/caption\]/g, function( a ) {
|
||||
// keep existing <br>
|
||||
|
|
@ -189,57 +209,68 @@ var switchEditors = {
|
|||
pee = pee.replace( /\n\s*\n+/g, '\n\n' );
|
||||
pee = pee.replace( /([\s\S]+?)\n\n/g, '<p>$1</p>\n' );
|
||||
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( /<p>(<li.+?)<\/p>/gi, '$1');
|
||||
pee = pee.replace( /<p>\s*<blockquote([^>]*)>/gi, '<blockquote$1><p>');
|
||||
pee = pee.replace( /<\/blockquote>\s*<\/p>/gi, '</p></blockquote>');
|
||||
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( '<p>\\s*(</?(?:' + blocklist + ')(?: [^>]*)?>)', 'gi' ), '$1' );
|
||||
pee = pee.replace( new RegExp( '(</?(?:' + blocklist + ')(?: [^>]*)?>)\\s*</p>', 'gi' ), '$1' );
|
||||
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( /<br \/>(\s*<\/?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)/gi, '$1' );
|
||||
pee = pee.replace( /(?:<p>|<br ?\/?>)*\s*\[caption([^\[]+)\[\/caption\]\s*(?:<\/p>|<br ?\/?>)*/gi, '[caption$1[/caption]' );
|
||||
|
||||
pee = pee.replace( /(<(?:div|th|td|form|fieldset|dd)[^>]*>)(.*?)<\/p>/g, function( a, b, c ) {
|
||||
if ( c.match(/<p( [^>]*)?>/) )
|
||||
if ( c.match( /<p( [^>]*)?>/ ) ) {
|
||||
return a;
|
||||
}
|
||||
|
||||
return b + '<p>' + c + '</p>';
|
||||
});
|
||||
|
||||
// put back the line breaks in pre|script
|
||||
if ( preserve_linebreaks )
|
||||
if ( preserve_linebreaks ) {
|
||||
pee = pee.replace( /<wp-temp-lb>/g, '\n' );
|
||||
}
|
||||
|
||||
if ( preserve_br )
|
||||
if ( preserve_br ) {
|
||||
pee = pee.replace( /<wp-temp-br([^>]*)>/g, '<br$1>' );
|
||||
}
|
||||
|
||||
return pee;
|
||||
},
|
||||
|
||||
pre_wpautop: function( content ) {
|
||||
var t = this, o = { o: t, data: content, unfiltered: content },
|
||||
q = typeof(jQuery) != 'undefined';
|
||||
q = typeof( jQuery ) !== 'undefined';
|
||||
|
||||
if ( q )
|
||||
if ( q ) {
|
||||
jQuery( 'body' ).trigger( 'beforePreWpautop', [ o ] );
|
||||
}
|
||||
|
||||
o.data = t._wp_Nop( o.data );
|
||||
if ( q )
|
||||
|
||||
if ( q ) {
|
||||
jQuery('body').trigger('afterPreWpautop', [ o ] );
|
||||
}
|
||||
|
||||
return o.data;
|
||||
},
|
||||
|
||||
wpautop: function( pee ) {
|
||||
var t = this, o = { o: t, data: pee, unfiltered: pee },
|
||||
q = typeof(jQuery) != 'undefined';
|
||||
q = typeof( jQuery ) !== 'undefined';
|
||||
|
||||
if ( q )
|
||||
if ( q ) {
|
||||
jQuery( 'body' ).trigger('beforeWpautop', [ o ] );
|
||||
}
|
||||
|
||||
o.data = t._wp_Autop( o.data );
|
||||
if ( q )
|
||||
|
||||
if ( q ) {
|
||||
jQuery( 'body' ).trigger('afterWpautop', [ o ] );
|
||||
}
|
||||
|
||||
return o.data;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue