Changeset 47003

Timestamp:

12/21/2019 06:32:45 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Shortcodes: Make sure wp.shortcode.string() accepts the attrs array keys in any order.

Props yale01, georgestephanis, adamsilverstein, zsusag, mircoraffinetti, SergeyBiryukov.
Fixes #36263.

Location:

trunk

Files:

• src/js/_enqueues/wp/shortcode.js (modified) (1 diff)
• tests/qunit/wp-includes/js/shortcode.js (modified) (1 diff)

trunk/src/js/_enqueues/wp/shortcode.js

@@ -228 +228 @@
 
         // 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, this.attrs );
 
         // Handle a flat object of attributes.

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

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