Ticket #36263: 36263.2.diff

src/wp-includes/js/shortcode.js

@@ -216 +216 @@
                         this.attrs = wp.shortcode.attrs( attrs );
 
                 // Identify a correctly formatted `attrs` object.
-                } else if ( _.isEqual( _.keys( attrs ), [ 'named', 'numeric' ] ) ) {
-                        this.attrs = attrs;
+                } else if ( _.difference( _.keys( attrs ), [ 'named', 'numeric' ] ).length === 0 ) {
+                        this.attrs = _.defaults( attrs, { named : {}, numeric : [] } );
 
                 // Handle a flat object of attributes.
                 } else {

tests/qunit/wp-includes/js/shortcode.js

@@ -196 +196 @@
 
         deepEqual( wp.shortcode.attrs('foo not="a blocker" bar baz'), expected, 'attr parsed numeric attributes');
     });
+
+    test( 'string() should accept attrs in any order', function() {
+        var expected = '[short abc123 foo="bar"]';
+        var test = {
+            tag   : 'short',
+            type  : 'single',
+            attrs : {
+                named   : { foo : 'bar' },
+                numeric : [ 'abc123' ]
+            }
+        }
+        deepEqual( wp.shortcode.string( test ), expected );
+        var test = {
+            tag   : 'short',
+            type  : 'single',
+            attrs : {
+                numeric : [ 'abc123' ],
+                named   : { foo : 'bar' }
+            }
+        }
+        deepEqual( wp.shortcode.string( test ), expected );
+    });
 });