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

Fix JSHint errors in shortcode.js. 

props tommcfarlin.
fixes #25945.

Built from https://develop.svn.wordpress.org/trunk@26228


git-svn-id: http://core.svn.wordpress.org/trunk@26135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-11-15 21:25:10 +00:00
parent 3c0f497fad
commit 4a6102adb7
1 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
wp-includes/js/shortcode.js
View File

@ -19,12 +19,14 @@ window.wp = window.wp || {};
re.lastIndex = index || 0; re.lastIndex = index || 0;
match = re.exec( text ); match = re.exec( text );
if ( ! match ) if ( ! match ) {
return; return;
}
// If we matched an escaped shortcode, try again. // If we matched an escaped shortcode, try again.
if ( match[1] === '[' && match[7] === ']' ) if ( '[' === match[1] && ']' === match[7] ) {
return wp.shortcode.next( tag, text, re.lastIndex ); return wp.shortcode.next( tag, text, re.lastIndex );
}
result = { result = {
index: match.index, index: match.index,
@ -40,8 +42,9 @@ window.wp = window.wp || {};
} }
// If we matched a trailing `]`, strip it from the match. // If we matched a trailing `]`, strip it from the match.
if ( match[7] ) if ( match[7] ) {
result.match = result.match.slice( 0, -1 ); result.match = result.match.slice( 0, -1 );
}
return result; return result;
}, },
@ -56,11 +59,12 @@ window.wp = window.wp || {};
// a shortcode `attrs` object, the `content` between shortcode tags, // a shortcode `attrs` object, the `content` between shortcode tags,
// and a boolean flag to indicate if the match was a `single` tag. // and a boolean flag to indicate if the match was a `single` tag.
replace: function( tag, text, callback ) { replace: function( tag, text, callback ) {
return text.replace( wp.shortcode.regexp( tag ), function( match, left, tag, attrs, slash, content, closing, right, offset ) { return text.replace( wp.shortcode.regexp( tag ), function( match, left, tag, attrs, slash, content, closing, right ) {
// If both extra brackets exist, the shortcode has been // If both extra brackets exist, the shortcode has been
// properly escaped. // properly escaped.
if ( left === '[' && right === ']' ) if ( left === '[' && right === ']' ) {
return match; return match;
}
// Create the match object and pass it through the callback. // Create the match object and pass it through the callback.
var result = callback( wp.shortcode.fromMatch( arguments ) ); var result = callback( wp.shortcode.fromMatch( arguments ) );
@ -164,12 +168,13 @@ window.wp = window.wp || {};
fromMatch: function( match ) { fromMatch: function( match ) {
var type; var type;
if ( match[4] ) if ( match[4] ) {
type = 'self-closing'; type = 'self-closing';
else if ( match[6] ) } else if ( match[6] ) {
type = 'closed'; type = 'closed';
else } else {
type = 'single'; type = 'single';
}
return new wp.shortcode({ return new wp.shortcode({
tag: match[2], tag: match[2],
@ -202,8 +207,9 @@ window.wp = window.wp || {};
numeric: [] numeric: []
}; };
if ( ! attrs ) if ( ! attrs ) {
return; return;
}
// Parse a string of attributes. // Parse a string of attributes.
if ( _.isString( attrs ) ) { if ( _.isString( attrs ) ) {
@ -244,10 +250,11 @@ window.wp = window.wp || {};
var text = '[' + this.tag; var text = '[' + this.tag;
_.each( this.attrs.numeric, function( value ) { _.each( this.attrs.numeric, function( value ) {
if ( /\s/.test( value ) ) if ( /\s/.test( value ) ) {
text += ' "' + value + '"'; text += ' "' + value + '"';
else } else {
text += ' ' + value; text += ' ' + value;
}
}); });
_.each( this.attrs.named, function( value, name ) { _.each( this.attrs.named, function( value, name ) {
@ -256,16 +263,18 @@ window.wp = window.wp || {};
// If the tag is marked as `single` or `self-closing`, close the // If the tag is marked as `single` or `self-closing`, close the
// tag and ignore any additional content. // tag and ignore any additional content.
if ( 'single' === this.type ) if ( 'single' === this.type ) {
return text + ']'; return text + ']';
else if ( 'self-closing' === this.type ) } else if ( 'self-closing' === this.type ) {
return text + ' /]'; return text + ' /]';
}
// Complete the opening tag. // Complete the opening tag.
text += ']'; text += ']';
if ( this.content ) if ( this.content ) {
text += this.content; text += this.content;
}
// Add the closing tag. // Add the closing tag.
return text + '[/' + this.tag + ']'; return text + '[/' + this.tag + ']';
@ -291,15 +300,17 @@ window.wp = window.wp || {};
var result, attrs; var result, attrs;
// If `content` ends in a slash, strip it. // If `content` ends in a slash, strip it.
if ( '/' === content[ content.length - 1 ] ) if ( '/' === content[ content.length - 1 ] ) {
content = content.slice( 0, -1 ); content = content.slice( 0, -1 );
}
result = wp.shortcode.attrs( content ); result = wp.shortcode.attrs( content );
attrs = result.named; attrs = result.named;
_.each( result.numeric, function( key ) { _.each( result.numeric, function( key ) {
if ( /\s/.test( key ) ) if ( /\s/.test( key ) ) {
return; return;
}
attrs[ key ] = ''; attrs[ key ] = '';
}); });
@ -316,19 +327,22 @@ window.wp = window.wp || {};
text += ' ' + attr; text += ' ' + attr;
// Use empty attribute notation where possible. // Use empty attribute notation where possible.
if ( '' === value ) if ( '' === value ) {
return; return;
}
// Convert boolean values to strings. // Convert boolean values to strings.
if ( _.isBoolean( value ) ) if ( _.isBoolean( value ) ) {
value = value ? 'true' : 'false'; value = value ? 'true' : 'false';
}
text += '="' + value + '"'; text += '="' + value + '"';
}); });
// Return the result if it is a self-closing tag. // Return the result if it is a self-closing tag.
if ( options.single ) if ( options.single ) {
return text + ' />'; return text + ' />';
}
// Complete the opening tag. // Complete the opening tag.
text += '>'; text += '>';