Changeset 26228

Timestamp:

11/15/2013 09:24:43 PM (13 years ago)

Author:

nacin

Message:

Fix JSHint errors in shortcode.js.

props tommcfarlin.
fixes #25945.

File:

• trunk/src/wp-includes/js/shortcode.js (modified) (11 diffs)

trunk/src/wp-includes/js/shortcode.js

@@ -20 +20 @@
                         match = re.exec( text );
 
-                        if ( ! match )
+                        if ( ! match ) {
                                 return;
+                        }
 
                         // 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 );
+                        }
 
                         result = {
@@ -41 +43 @@
 
                         // If we matched a trailing `]`, strip it from the match.
-                        if ( match[7] )
+                        if ( match[7] ) {
                                 result.match = result.match.slice( 0, -1 );
+                        }
 
                         return result;
@@ -57 +60 @@
                 // and a boolean flag to indicate if the match was a `single` tag.
                 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
                                 // properly escaped.
-                                if ( left === '[' && right === ']' )
+                                if ( left === '[' && right === ']' ) {
                                         return match;
+                                }
 
                                 // Create the match object and pass it through the callback.
@@ -165 +169 @@
                         var type;
 
-                        if ( match[4] )
+                        if ( match[4] ) {
                                 type = 'self-closing';
-                        else if ( match[6] )
+                        } else if ( match[6] ) {
                                 type = 'closed';
-                        else
+                        } else {
                                 type = 'single';
+                        }
 
                         return new wp.shortcode({
@@ -203 +208 @@
                 };
 
-                if ( ! attrs )
+                if ( ! attrs ) {
                         return;
+                }
 
                 // Parse a string of attributes.
@@ -245 +251 @@
 
                         _.each( this.attrs.numeric, function( value ) {
-                                if ( /\s/.test( value ) )
+                                if ( /\s/.test( value ) ) {
                                         text += ' "' + value + '"';
-                                else
+                                } else {
                                         text += ' ' + value;
+                                }
                         });
 
@@ -257 +264 @@
                         // If the tag is marked as `single` or `self-closing`, close the
                         // tag and ignore any additional content.
-                        if ( 'single' === this.type )
+                        if ( 'single' === this.type ) {
                                 return text + ']';
-                        else if ( 'self-closing' === this.type )
+                        } else if ( 'self-closing' === this.type ) {
                                 return text + ' /]';
+                        }
 
                         // Complete the opening tag.
                         text += ']';
 
-                        if ( this.content )
+                        if ( this.content ) {
                                 text += this.content;
+                        }
 
                         // Add the closing tag.
@@ -292 +301 @@
 
                         // If `content` ends in a slash, strip it.
-                        if ( '/' === content[ content.length - 1 ] )
+                        if ( '/' === content[ content.length - 1 ] ) {
                                 content = content.slice( 0, -1 );
+                        }
 
                         result = wp.shortcode.attrs( content );
@@ -299 +309 @@
 
                         _.each( result.numeric, function( key ) {
-                                if ( /\s/.test( key ) )
+                                if ( /\s/.test( key ) ) {
                                         return;
+                                }
 
                                 attrs[ key ] = '';
@@ -317 +328 @@
 
                                 // Use empty attribute notation where possible.
-                                if ( '' === value )
+                                if ( '' === value ) {
                                         return;
+                                }
 
                                 // Convert boolean values to strings.
-                                if ( _.isBoolean( value ) )
+                                if ( _.isBoolean( value ) ) {
                                         value = value ? 'true' : 'false';
+                                }
 
                                 text += '="' + value + '"';
@@ -328 +341 @@
 
                         // Return the result if it is a self-closing tag.
-                        if ( options.single )
+                        if ( options.single ) {
                                 return text + ' />';
+                        }
 
                         // Complete the opening tag.