Ticket #25829: shortcode.diff

wp-includes/js/shortcode.js

@@ -114 +114 @@
                 // `name='value'`, or `name=value`. Numeric attributes can be formatted
                 // as `"value"` or just `value`.
                 attrs: _.memoize( function( text ) {
-                        var named   = {},
-                                numeric = [],
-                                pattern, match;
-
-                        // This regular expression is reused from `shortcode_parse_atts()`
-                        // in `wp-includes/shortcodes.php`.
-                        //
-                        // Capture groups:
-                        //
-                        // 1. An attribute name, that corresponds to...
-                        // 2. a value in double quotes.
-                        // 3. An attribute name, that corresponds to...
-                        // 4. a value in single quotes.
-                        // 5. An attribute name, that corresponds to...
-                        // 6. an unquoted value.
-                        // 7. A numeric attribute in double quotes.
-                        // 8. An unquoted numeric attribute.
-                        pattern = /(\w+)\s*=\s*"([^"]*)"(?:\s|$)|(\w+)\s*=\s*\'([^\']*)\'(?:\s|$)|(\w+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/g;
-
-                        // Map zero-width spaces to actual spaces.
-                        text = text.replace( /[\u00a0\u200b]/g, ' ' );
-
-                        // Match and normalize attributes.
-                        while ( (match = pattern.exec( text )) ) {
-                                if ( match[1] ) {
-                                        named[ match[1].toLowerCase() ] = match[2];
-                                } else if ( match[3] ) {
-                                        named[ match[3].toLowerCase() ] = match[4];
-                                } else if ( match[5] ) {
-                                        named[ match[5].toLowerCase() ] = match[6];
-                                } else if ( match[7] ) {
-                                        numeric.push( match[7] );
-                                } else if ( match[8] ) {
-                                        numeric.push( match[8] );
-                                }
-                        }
-
-                        return {
-                                named:   named,
-                                numeric: numeric
-                        };
+                        return wp.html._attrs( text, { dashesInNames: false } );
                 }),
 
                 // ### Generate a Shortcode Object from a RegExp match
@@ -279 +239 @@
 // Experimental. These functions may change or be removed in the future.
 (function(){
         wp.html = _.extend( wp.html || {}, {
+
+                _attrs: function( text, options ) {
+                        var named   = {},
+                                numeric = [],
+                                pattern, match, namePattern;
+
+                        options = options || {};
+                        _.defaults( options, {
+                                dashesInNames: true
+                        } );
+
+                        // This regular expression is reused from `shortcode_parse_atts()`
+                        // in `wp-includes/shortcodes.php`.
+                        //
+                        // Capture groups:
+                        //
+                        // 1. An attribute name, that corresponds to...
+                        // 2. a value in double quotes.
+                        // 3. An attribute name, that corresponds to...
+                        // 4. a value in single quotes.
+                        // 5. An attribute name, that corresponds to...
+                        // 6. an unquoted value.
+                        // 7. A numeric attribute in double quotes.
+                        // 8. An unquoted numeric attribute.
+                        namePattern = options.dashesInNames ? '[\\w\\-]' : '\\w';
+                        pattern = new RegExp( '('+namePattern+'+)\\s*=\\s*"([^"]*)"(?:\\s|$)|(\\w+)\\s*=\\s*\'([^\']*)\'(?:\\s|$)|(\\w+)\\s*=\\s*([^\\s\'"]+)(?:\\s|$)|"([^"]*)"(?:\\s|$)|(\\S+)(?:\\s|$)', 'g' );
+
+                        // Map zero-width spaces to actual spaces.
+                        text = text.replace( /[\u00a0\u200b]/g, ' ' );
+
+                        // Match and normalize attributes.
+                        while ( (match = pattern.exec( text )) ) {
+                                if ( match[1] ) {
+                                        named[ match[1].toLowerCase() ] = match[2];
+                                } else if ( match[3] ) {
+                                        named[ match[3].toLowerCase() ] = match[4];
+                                } else if ( match[5] ) {
+                                        named[ match[5].toLowerCase() ] = match[6];
+                                } else if ( match[7] ) {
+                                        numeric.push( match[7] );
+                                } else if ( match[8] ) {
+                                        numeric.push( match[8] );
+                                }
+                        }
+
+                        return {
+                                named:   named,
+                                numeric: numeric
+                        };
+                },
+
                 // ### Parse HTML attributes.
                 //
                 // Converts `content` to a set of parsed HTML attributes.
@@ -287 +298 @@
                 // object that contains the `attrs` with `key:value` mapping, and a record
                 // of the attributes that were entered using `empty` attribute syntax (i.e.
                 // with no value).
-                attrs: function( content ) {
+                attrs: _.memoize( function( content ) {
                         var result, attrs;
 
                         // If `content` ends in a slash, strip it.
                         if ( '/' === content[ content.length - 1 ] )
                                 content = content.slice( 0, -1 );
 
-                        result = wp.shortcode.attrs( content );
+                        result = wp.html._attrs( content );
                         attrs  = result.named;
 
                         _.each( result.numeric, function( key ) {
@@ -305 +316 @@
                         });
 
                         return attrs;
-                },
+                } ),
 
                 // ### Convert an HTML-representation of an object to a string.
                 string: function( options ) {