enmi-conf.org: comparison wp/wp-includes/js/shortcode.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/shortcode.js

changeset 5	5e2f62d02dcd
parent 0	d970ebf37754
child 7	cf61fcea0001

equal deleted inserted replaced

-:346c88efed21
+:5e2f62d02dcd
-// Utility functions for parsing and handling shortcodes in Javascript.
+// Utility functions for parsing and handling shortcodes in JavaScript.
 // Ensure the global `wp` object exists.
 window.wp = window.wp || {};
 (function(){
 				match, result;
 			re.lastIndex = index || 0;
 			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 = {
 				index:     match.index,
 				content:   match[0],
 				shortcode: wp.shortcode.fromMatch( match )
 			};
 			// If we matched a leading `[`, strip it from the match
 			// and increment the index accordingly.
 			if ( match[1] ) {
-				result.match = result.match.slice( 1 );
+				result.content = result.content.slice( 1 );
 				result.index++;
 			}
 			// If we matched a trailing `]`, strip it from the match.
-			if ( match[7] )
+			if ( match[7] ) {
-				result.match = result.match.slice( 0, -1 );
+				result.content = result.content.slice( 0, -1 );
+			}
 			return result;
 		},
 		// ### Replace matching shortcodes in a block of text
 		//
 		// Shortcode matches are objects that contain the shortcode `tag`,
 		// a shortcode `attrs` object, the `content` between shortcode tags,
 		// 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.
 				var result = callback( wp.shortcode.fromMatch( arguments ) );
 				// Make sure to return any of the extra brackets if they
 		// generated by `wp.shortcode.regexp()`. `match` can also be set to the
 		// `arguments` from a callback passed to `regexp.replace()`.
 		fromMatch: function( match ) {
 			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({
 				tag:     match[2],
 				attrs:   match[3],
 				type:    type,
 		this.attrs = {
 			named:   {},
 			numeric: []
 		};
-		if ( ! attrs )
+		if ( ! attrs ) {
 			return;
+		}
 		// Parse a string of attributes.
 		if ( _.isString( attrs ) ) {
 			this.attrs = wp.shortcode.attrs( attrs );
 		// ### Transform the shortcode match into a string
 		string: function() {
 			var text    = '[' + this.tag;
 			_.each( this.attrs.numeric, function( value ) {
-				if ( /\s/.test( value ) )
+				if ( /\s/.test( value ) ) {
 					text += ' "' + value + '"';
-				else
+				} else {
 					text += ' ' + value;
+				}
 			});
 			_.each( this.attrs.named, function( value, name ) {
 				text += ' ' + name + '="' + value + '"';
 			});
 			// 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.
 			return text + '[/' + this.tag + ']';
 		}
 	});
 		// with no value).
 		attrs: function( content ) {
 			var result, attrs;
 			// 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 );
 			attrs  = result.named;
 			_.each( result.numeric, function( key ) {
-				if ( /\s/.test( key ) )
+				if ( /\s/.test( key ) ) {
 					return;
+				}
 				attrs[ key ] = '';
 			});
 			return attrs;
 			_.each( options.attrs, function( value, attr ) {
 				text += ' ' + attr;
 				// 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 + '"';
 			});
 			// Return the result if it is a self-closing tag.
-			if ( options.single )
+			if ( options.single ) {
 				return text + ' />';
+			}
 			// Complete the opening tag.
 			text += '>';
 			// If `content` is an object, recursively call this function.

enmi-conf.org