WordPress.org

Make WordPress Core

Ticket #45066: 45066.diff

File 45066.diff, 3.9 KB (added by whyisjake, 5 weeks ago)

combined diff

  • Gruntfile.js

     
    303303                                        [ WORKING_DIR + 'wp-includes/js/quicktags.js' ]: [ './src/js/_enqueues/lib/quicktags.js' ],
    304304                                        [ WORKING_DIR + 'wp-includes/js/shortcode.js' ]: [ './src/js/_enqueues/wp/shortcode.js' ],
    305305                                        [ WORKING_DIR + 'wp-includes/js/utils.js' ]: [ './src/js/_enqueues/lib/cookies.js' ],
    306                                         [ WORKING_DIR + 'wp-includes/js/wp-a11y.js' ]: [ './src/js/_enqueues/wp/a11y.js' ],
    307306                                        [ WORKING_DIR + 'wp-includes/js/wp-ajax-response.js' ]: [ './src/js/_enqueues/lib/ajax-response.js' ],
    308307                                        [ WORKING_DIR + 'wp-includes/js/wp-api.js' ]: [ './src/js/_enqueues/wp/api.js' ],
    309308                                        [ WORKING_DIR + 'wp-includes/js/wp-auth-check.js' ]: [ './src/js/_enqueues/lib/auth-check.js' ],
     
    846845                                        'src/wp-includes/js/quicktags.js': 'src/js/_enqueues/lib/quicktags.js',
    847846                                        'src/wp-includes/js/shortcode.js': 'src/js/_enqueues/wp/shortcode.js',
    848847                                        'src/wp-includes/js/utils.js': 'src/js/_enqueues/lib/cookies.js',
    849                                         'src/wp-includes/js/wp-a11y.js': 'src/js/_enqueues/wp/a11y.js',
    850848                                        'src/wp-includes/js/wp-ajax-response.js': 'src/js/_enqueues/lib/ajax-response.js',
    851849                                        'src/wp-includes/js/wp-api.js': 'src/js/_enqueues/wp/api.js',
    852850                                        'src/wp-includes/js/wp-auth-check.js': 'src/js/_enqueues/lib/auth-check.js',
  • src/wp-admin/includes/update-core.php

     
    786786        // 5.1
    787787        'wp-includes/random_compat/random_bytes_openssl.php',
    788788        'wp-includes/js/tinymce/wp-tinymce.js.gz',
     789        // 5.3
     790        'wp-includes/js/wp-a11y.js', // Moved to: wp-includes/js/dist/a11y.js
     791        'wp-includes/js/wp-a11y.min.js', // Moved to: wp-includes/js/dist/a11y.min.js
    789792);
    790793
    791794/**
  • tests/phpunit/tests/dependencies/scripts.php

     
    734734                global $wp_scripts;
    735735
    736736                wp_default_scripts( $wp_scripts );
     737                wp_default_packages( $wp_scripts );
    737738
    738739                $wp_scripts->base_url  = '';
    739740                $wp_scripts->do_concat = true;
    740741
    741                 $expected_tail  = "<![endif]-->\n";
    742                 $expected_tail .= "<script type='text/javascript' src='/customize-dependency.js'></script>\n";
     742                $expected_tail = "<script type='text/javascript' src='/customize-dependency.js'></script>\n";
    743743                $expected_tail .= "<script type='text/javascript'>\n";
    744744                $expected_tail .= "tryCustomizeDependency()\n";
    745745                $expected_tail .= "</script>\n";
     
    748748                wp_enqueue_script( $handle, '/customize-dependency.js', array( 'customize-controls' ), null );
    749749                wp_add_inline_script( $handle, 'tryCustomizeDependency()' );
    750750
     751                // Open a buffer to get the output of `wp_print_scripts`.
     752                ob_start();
    751753                wp_print_scripts();
    752                 $print_scripts = get_echo( '_print_scripts' );
     754                $print_scripts = ob_get_clean();
    753755
    754                 $tail = substr( $print_scripts, strrpos( $print_scripts, '<![endif]-->' ) );
     756                $tail = substr( $print_scripts, strrpos( $print_scripts, "<script type='text/javascript' src='/customize-dependency.js'>" ) );
    755757                $this->assertEquals( $expected_tail, $tail );
    756758        }
    757759
  • tests/qunit/index.html

     
    2424                        };
    2525                </script>
    2626                <script src="../../build/wp-includes/js/wp-util.js"></script>
    27                 <script src="../../build/wp-includes/js/wp-a11y.js"></script>
     27                <script src="../../build/wp-includes/js/dist/a11y.js"></script>
    2828                <script>
    2929                        window._wpMediaModelsL10n = {"settings":{"ajaxurl":"\/wp-admin\/admin-ajax.php","post":{"id":0}}};
    3030                </script>