WordPress 4.4

[autoinstalls/wordpress.git] / wp-includes / js / shortcode.js

diff --git a/wp-includes/js/shortcode.js b/wp-includes/js/shortcode.js
index 677c99a5e89bb4db933ebd0eba7ae36a632fa98c..7028f6a8bdb5a0888ada2e88633265a041c51771 100644 (file)
--- a/wp-includes/js/shortcode.js
+++ b/wp-includes/js/shortcode.js
@@ -1,4 +1,4 @@
-// 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 || {};
@@ -37,13 +37,13 @@ window.wp = window.wp || {};
                        // 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] ) {
-                               result.match = result.match.slice( 0, -1 );
+                               result.content = result.content.slice( 0, -1 );
                        }
 
                        return result;
@@ -135,7 +135,7 @@ window.wp = window.wp || {};
                        // 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;
+                       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, ' ' );
@@ -353,4 +353,4 @@ window.wp = window.wp || {};
                        return text + '</' + options.tag + '>';
                }
        });
-}());
\ No newline at end of file
+}());