Changeset 46167

Timestamp:

09/18/2019 05:40:35 PM (5 years ago)

Author:

whyisjake

Message:

Accessibility: Replace wp-a11y.js with @wordpress/a11y package

We've extracted wp-includes/wp-a11y.js to a reusable package wordpress/a11y which is published on NPM. Let's make sure this package is also used in WordPress core. Once all the JavaScript is built using webpack, we can also import this package wherever it is used and configure webpack to load is an external.

Props omarreiss, herregroen, desrosj, ocean90, afercia, sstoqnov

Location:

trunk

Files:

• Gruntfile.js (modified) (2 diffs)
• src/wp-admin/includes/update-core.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/scripts.php (modified) (2 diffs)
• tests/qunit/index.html (modified) (1 diff)

trunk/Gruntfile.js

@@ -304 +304 @@
                     [ WORKING_DIR + 'wp-includes/js/shortcode.js' ]: [ './src/js/_enqueues/wp/shortcode.js' ],
                     [ WORKING_DIR + 'wp-includes/js/utils.js' ]: [ './src/js/_enqueues/lib/cookies.js' ],
-                    [ WORKING_DIR + 'wp-includes/js/wp-a11y.js' ]: [ './src/js/_enqueues/wp/a11y.js' ],
                     [ WORKING_DIR + 'wp-includes/js/wp-ajax-response.js' ]: [ './src/js/_enqueues/lib/ajax-response.js' ],
                     [ WORKING_DIR + 'wp-includes/js/wp-api.js' ]: [ './src/js/_enqueues/wp/api.js' ],
@@ -847 +846 @@
                     'src/wp-includes/js/shortcode.js': 'src/js/_enqueues/wp/shortcode.js',
                     'src/wp-includes/js/utils.js': 'src/js/_enqueues/lib/cookies.js',
-                    'src/wp-includes/js/wp-a11y.js': 'src/js/_enqueues/wp/a11y.js',
                     'src/wp-includes/js/wp-ajax-response.js': 'src/js/_enqueues/lib/ajax-response.js',
                     'src/wp-includes/js/wp-api.js': 'src/js/_enqueues/wp/api.js',

trunk/src/wp-admin/includes/update-core.php

@@ -787 +787 @@
     'wp-includes/random_compat/random_bytes_openssl.php',
     'wp-includes/js/tinymce/wp-tinymce.js.gz',
+    // 5.3
+    'wp-includes/js/wp-a11y.js', // Moved to: wp-includes/js/dist/a11y.js
+    'wp-includes/js/wp-a11y.min.js', // Moved to: wp-includes/js/dist/a11y.min.js
 );
 

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -735 +735 @@
 
         wp_default_scripts( $wp_scripts );
+        wp_default_packages( $wp_scripts );
 
         $wp_scripts->base_url  = '';
         $wp_scripts->do_concat = true;
 
-        $expected_tail  = "<![endif]-->\n";
-        $expected_tail .= "<script type='text/javascript' src='/customize-dependency.js'></script>\n";
+        $expected_tail = "<script type='text/javascript' src='/customize-dependency.js'></script>\n";
         $expected_tail .= "<script type='text/javascript'>\n";
         $expected_tail .= "tryCustomizeDependency()\n";
@@ -749 +749 @@
         wp_add_inline_script( $handle, 'tryCustomizeDependency()' );
 
+        // Open a buffer to get the output of `wp_print_scripts`.
+        ob_start();
         wp_print_scripts();
-        $print_scripts = get_echo( '_print_scripts' );
-
-        $tail = substr( $print_scripts, strrpos( $print_scripts, '<![endif]-->' ) );
+        $print_scripts = ob_get_clean();
+
+        $tail = substr( $print_scripts, strrpos( $print_scripts, "<script type='text/javascript' src='/customize-dependency.js'>" ) );
         $this->assertEquals( $expected_tail, $tail );
     }

trunk/tests/qunit/index.html

@@ -25 +25 @@
         </script>
         <script src="../../build/wp-includes/js/wp-util.js"></script>
-        <script src="../../build/wp-includes/js/wp-a11y.js"></script>
+        <script src="../../build/wp-includes/js/dist/a11y.js"></script>
         <script>
             window._wpMediaModelsL10n = {"settings":{"ajaxurl":"\/wp-admin\/admin-ajax.php","post":{"id":0}}};