Changeset 48295
- Timestamp:
- 07/04/2020 04:52:49 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/class.wp-scripts.php
r47219 r48295 228 228 } 229 229 230 echo "<script{$this->type_attr}>\n";230 printf( "<script%s id='%s-js-extra'>\n", $this->type_attr, esc_attr( $handle ) ); 231 231 232 232 // CDATA is not needed for HTML 5. … … 299 299 300 300 if ( $before_handle ) { 301 $before_handle = sprintf( "<script%s >\n%s\n</script>\n", $this->type_attr, $before_handle );301 $before_handle = sprintf( "<script%s id='%s-js-before'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $before_handle ); 302 302 } 303 303 304 304 if ( $after_handle ) { 305 $after_handle = sprintf( "<script%s >\n%s\n</script>\n", $this->type_attr, $after_handle );305 $after_handle = sprintf( "<script%s id='%s-js-after'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $after_handle ); 306 306 } 307 307 … … 367 367 $translations = $this->print_translations( $handle, false ); 368 368 if ( $translations ) { 369 $translations = sprintf( "<script%s >\n%s\n</script>\n", $this->type_attr, $translations );369 $translations = sprintf( "<script%s id='%s-js-translations'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $translations ); 370 370 } 371 371 … … 386 386 387 387 $tag = $translations . $cond_before . $before_handle; 388 $tag .= sprintf( "<script%s src='%s' ></script>\n", $this->type_attr, $src);388 $tag .= sprintf( "<script%s src='%s' id='%s-js'></script>\n", $this->type_attr, $src, esc_attr( $handle ) ); 389 389 $tag .= $after_handle . $cond_after; 390 390 … … 459 459 460 460 if ( $echo ) { 461 printf( "<script%s >\n%s\n</script>\n", $this->type_attr, $output );461 printf( "<script%s id='%s-js-%s'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), esc_attr( $position ), $output ); 462 462 } 463 463 … … 596 596 597 597 if ( $echo ) { 598 printf( "<script%s >\n%s\n</script>\n", $this->type_attr, $output );598 printf( "<script%s id='%s-js-translations'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $output ); 599 599 } 600 600 -
trunk/tests/phpunit/tests/dependencies/scripts.php
r48177 r48295 18 18 19 19 $this->wp_scripts_print_translations_output = <<<JS 20 <script type='text/javascript' >20 <script type='text/javascript' id='__HANDLE__-js-translations'> 21 21 ( function( domain, translations ) { 22 22 var localeData = translations.locale_data[ domain ] || translations.locale_data.messages; … … 47 47 48 48 $ver = get_bloginfo( 'version' ); 49 $expected = "<script type='text/javascript' src='http://example.com?ver=$ver' ></script>\n";50 $expected .= "<script type='text/javascript' src='http://example.com?ver=$ver' ></script>\n";51 $expected .= "<script type='text/javascript' src='http://example.com?ver=1.2' ></script>\n";52 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";49 $expected = "<script type='text/javascript' src='http://example.com?ver=$ver' id='no-deps-no-version-js'></script>\n"; 50 $expected .= "<script type='text/javascript' src='http://example.com?ver=$ver' id='empty-deps-no-version-js'></script>\n"; 51 $expected .= "<script type='text/javascript' src='http://example.com?ver=1.2' id='empty-deps-version-js'></script>\n"; 52 $expected .= "<script type='text/javascript' src='http://example.com' id='empty-deps-null-version-js'></script>\n"; 53 53 54 54 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 70 70 71 71 $ver = get_bloginfo( 'version' ); 72 $expected = "<script src='http://example.com?ver=$ver' ></script>\n";72 $expected = "<script src='http://example.com?ver=$ver' id='empty-deps-no-version-js'></script>\n"; 73 73 74 74 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 91 91 // Try with an HTTP reference. 92 92 wp_enqueue_script( 'jquery-http', 'http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' ); 93 $expected .= "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' ></script>\n";93 $expected .= "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-http-js'></script>\n"; 94 94 95 95 // Try with an HTTPS reference. 96 96 wp_enqueue_script( 'jquery-https', 'https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' ); 97 $expected .= "<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' ></script>\n";97 $expected .= "<script type='text/javascript' src='https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-https-js'></script>\n"; 98 98 99 99 // Try with an automatic protocol reference (//). 100 100 wp_enqueue_script( 'jquery-doubleslash', '//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' ); 101 $expected .= "<script type='text/javascript' src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' ></script>\n";101 $expected .= "<script type='text/javascript' src='//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-doubleslash-js'></script>\n"; 102 102 103 103 // Try with a local resource and an automatic protocol reference (//). 104 104 $url = '//my_plugin/script.js'; 105 105 wp_enqueue_script( 'plugin-script', $url ); 106 $expected .= "<script type='text/javascript' src='$url?ver=$ver' ></script>\n";106 $expected .= "<script type='text/javascript' src='$url?ver=$ver' id='plugin-script-js'></script>\n"; 107 107 108 108 // Try with a bad protocol. 109 109 wp_enqueue_script( 'jquery-ftp', 'ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js' ); 110 $expected .= "<script type='text/javascript' src='{$wp_scripts->base_url}ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' ></script>\n";110 $expected .= "<script type='text/javascript' src='{$wp_scripts->base_url}ftp://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js?ver=$ver' id='jquery-ftp-js'></script>\n"; 111 111 112 112 // Go! … … 151 151 wp_enqueue_script( 'test-only-data', 'example.com', array(), null ); 152 152 wp_script_add_data( 'test-only-data', 'data', 'testing' ); 153 $expected = "<script type='text/javascript' >\n/* <![CDATA[ */\ntesting\n/* ]]> */\n</script>\n";154 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";153 $expected = "<script type='text/javascript' id='test-only-data-js-extra'>\n/* <![CDATA[ */\ntesting\n/* ]]> */\n</script>\n"; 154 $expected .= "<script type='text/javascript' src='http://example.com' id='test-only-data-js'></script>\n"; 155 155 156 156 // Go! … … 170 170 wp_enqueue_script( 'test-only-conditional', 'example.com', array(), null ); 171 171 wp_script_add_data( 'test-only-conditional', 'conditional', 'gt IE 7' ); 172 $expected = "<!--[if gt IE 7]>\n<script type='text/javascript' src='http://example.com' ></script>\n<![endif]-->\n";172 $expected = "<!--[if gt IE 7]>\n<script type='text/javascript' src='http://example.com' id='test-only-conditional-js'></script>\n<![endif]-->\n"; 173 173 174 174 // Go! … … 189 189 wp_script_add_data( 'test-conditional-with-data', 'data', 'testing' ); 190 190 wp_script_add_data( 'test-conditional-with-data', 'conditional', 'lt IE 9' ); 191 $expected = "<!--[if lt IE 9]>\n<script type='text/javascript' >\n/* <![CDATA[ */\ntesting\n/* ]]> */\n</script>\n<![endif]-->\n";192 $expected .= "<!--[if lt IE 9]>\n<script type='text/javascript' src='http://example.com' ></script>\n<![endif]-->\n";191 $expected = "<!--[if lt IE 9]>\n<script type='text/javascript' id='test-conditional-with-data-js-extra'>\n/* <![CDATA[ */\ntesting\n/* ]]> */\n</script>\n<![endif]-->\n"; 192 $expected .= "<!--[if lt IE 9]>\n<script type='text/javascript' src='http://example.com' id='test-conditional-with-data-js'></script>\n<![endif]-->\n"; 193 193 194 194 // Go! … … 208 208 wp_enqueue_script( 'test-invalid', 'example.com', array(), null ); 209 209 wp_script_add_data( 'test-invalid', 'invalid', 'testing' ); 210 $expected = "<script type='text/javascript' src='http://example.com' ></script>\n";210 $expected = "<script type='text/javascript' src='http://example.com' id='test-invalid-js'></script>\n"; 211 211 212 212 // Go! … … 231 231 */ 232 232 function test_wp_register_script_with_handle_without_source() { 233 $expected = "<script type='text/javascript' src='http://example.com?ver=1' ></script>\n";234 $expected .= "<script type='text/javascript' src='http://example.com?ver=2' ></script>\n";233 $expected = "<script type='text/javascript' src='http://example.com?ver=1' id='handle-one-js'></script>\n"; 234 $expected .= "<script type='text/javascript' src='http://example.com?ver=2' id='handle-two-js'></script>\n"; 235 235 236 236 wp_register_script( 'handle-one', 'http://example.com', array(), 1 ); … … 320 320 $footer = get_echo( 'wp_print_footer_scripts' ); 321 321 322 $expected_header = "<script type='text/javascript' src='/child-footer.js' ></script>\n";323 $expected_header .= "<script type='text/javascript' src='/child-head.js' ></script>\n";324 $expected_footer = "<script type='text/javascript' src='/parent.js' ></script>\n";322 $expected_header = "<script type='text/javascript' src='/child-footer.js' id='child-footer-js'></script>\n"; 323 $expected_header .= "<script type='text/javascript' src='/child-head.js' id='child-head-js'></script>\n"; 324 $expected_footer = "<script type='text/javascript' src='/parent.js' id='parent-js'></script>\n"; 325 325 326 326 $this->assertEquals( $expected_header, $header ); … … 341 341 $footer = get_echo( 'wp_print_footer_scripts' ); 342 342 343 $expected_header = "<script type='text/javascript' src='/child-head.js' ></script>\n";344 $expected_footer = "<script type='text/javascript' src='/child-footer.js' ></script>\n";345 $expected_footer .= "<script type='text/javascript' src='/parent.js' ></script>\n";343 $expected_header = "<script type='text/javascript' src='/child-head.js' id='child-head-js'></script>\n"; 344 $expected_footer = "<script type='text/javascript' src='/child-footer.js' id='child-footer-js'></script>\n"; 345 $expected_footer .= "<script type='text/javascript' src='/parent.js' id='parent-js'></script>\n"; 346 346 347 347 $this->assertEquals( $expected_header, $header ); … … 367 367 $footer = get_echo( 'wp_print_footer_scripts' ); 368 368 369 $expected_header = "<script type='text/javascript' src='/child-head.js' ></script>\n";370 $expected_header .= "<script type='text/javascript' src='/grandchild-head.js' ></script>\n";371 $expected_header .= "<script type='text/javascript' src='/child2-head.js' ></script>\n";372 $expected_header .= "<script type='text/javascript' src='/parent-header.js' ></script>\n";373 374 $expected_footer = "<script type='text/javascript' src='/child-footer.js' ></script>\n";375 $expected_footer .= "<script type='text/javascript' src='/child2-footer.js' ></script>\n";376 $expected_footer .= "<script type='text/javascript' src='/parent-footer.js' ></script>\n";369 $expected_header = "<script type='text/javascript' src='/child-head.js' id='child-head-js'></script>\n"; 370 $expected_header .= "<script type='text/javascript' src='/grandchild-head.js' id='grandchild-head-js'></script>\n"; 371 $expected_header .= "<script type='text/javascript' src='/child2-head.js' id='child2-head-js'></script>\n"; 372 $expected_header .= "<script type='text/javascript' src='/parent-header.js' id='parent-header-js'></script>\n"; 373 374 $expected_footer = "<script type='text/javascript' src='/child-footer.js' id='child-footer-js'></script>\n"; 375 $expected_footer .= "<script type='text/javascript' src='/child2-footer.js' id='child2-footer-js'></script>\n"; 376 $expected_footer .= "<script type='text/javascript' src='/parent-footer.js' id='parent-footer-js'></script>\n"; 377 377 378 378 $this->assertEquals( $expected_header, $header ); … … 404 404 wp_add_inline_script( 'test-example', 'console.log("before");', 'before' ); 405 405 406 $expected = "<script type='text/javascript' >\nconsole.log(\"before\");\n</script>\n";407 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";406 $expected = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n"; 407 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 408 408 409 409 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 417 417 wp_add_inline_script( 'test-example', 'console.log("after");' ); 418 418 419 $expected = "<script type='text/javascript' src='http://example.com' ></script>\n";420 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";419 $expected = "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 420 $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n"; 421 421 422 422 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 431 431 wp_add_inline_script( 'test-example', 'console.log("after");' ); 432 432 433 $expected = "<script type='text/javascript' >\nconsole.log(\"before\");\n</script>\n";434 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";435 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";433 $expected = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n"; 434 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 435 $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n"; 436 436 437 437 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 446 446 wp_add_inline_script( 'test-example', 'console.log("before");', 'before' ); 447 447 448 $expected = "<script type='text/javascript' >\nconsole.log(\"before\");\n</script>\n";448 $expected = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n"; 449 449 450 450 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 459 459 wp_add_inline_script( 'test-example', 'console.log("after");' ); 460 460 461 $expected = "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";461 $expected = "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n"; 462 462 463 463 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 473 473 wp_add_inline_script( 'test-example', 'console.log("after");' ); 474 474 475 $expected = "<script type='text/javascript' >\nconsole.log(\"before\");\n</script>\n";476 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";475 $expected = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n"; 476 $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n"; 477 477 478 478 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 489 489 wp_add_inline_script( 'test-example', 'console.log("after");' ); 490 490 491 $expected = "<script type='text/javascript' >\nconsole.log(\"before\");\nconsole.log(\"before\");\n</script>\n";492 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";493 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\nconsole.log(\"after\");\n</script>\n";491 $expected = "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\nconsole.log(\"before\");\n</script>\n"; 492 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 493 $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\nconsole.log(\"after\");\n</script>\n"; 494 494 495 495 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 505 505 wp_add_inline_script( 'test-example', 'console.log("after");' ); 506 506 507 $expected = "<script type='text/javascript' >\n/* <![CDATA[ */\nvar testExample = {\"foo\":\"bar\"};\n/* ]]> */\n</script>\n";508 $expected .= "<script type='text/javascript' >\nconsole.log(\"before\");\n</script>\n";509 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";510 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";507 $expected = "<script type='text/javascript' id='test-example-js-extra'>\n/* <![CDATA[ */\nvar testExample = {\"foo\":\"bar\"};\n/* ]]> */\n</script>\n"; 508 $expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n"; 509 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 510 $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n"; 511 511 512 512 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 530 530 531 531 $ver = get_bloginfo( 'version' ); 532 $expected = "<script type='text/javascript' >\nconsole.log(\"before one\");\n</script>\n";533 $expected .= "<script type='text/javascript' src='/directory/one.js?ver={$ver}' ></script>\n";534 $expected .= "<script type='text/javascript' >\nconsole.log(\"before two\");\n</script>\n";535 $expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' ></script>\n";536 $expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' ></script>\n";532 $expected = "<script type='text/javascript' id='one-js-before'>\nconsole.log(\"before one\");\n</script>\n"; 533 $expected .= "<script type='text/javascript' src='/directory/one.js?ver={$ver}' id='one-js'></script>\n"; 534 $expected .= "<script type='text/javascript' id='two-js-before'>\nconsole.log(\"before two\");\n</script>\n"; 535 $expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' id='two-js'></script>\n"; 536 $expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' id='three-js'></script>\n"; 537 537 538 538 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 555 555 556 556 $ver = get_bloginfo( 'version' ); 557 $expected = "<script type='text/javascript' >\nconsole.log(\"before one\");\n</script>\n";558 $expected .= "<script type='text/javascript' src='/directory/one.js?ver={$ver}' ></script>\n";559 $expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' ></script>\n";560 $expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' ></script>\n";557 $expected = "<script type='text/javascript' id='one-js-before'>\nconsole.log(\"before one\");\n</script>\n"; 558 $expected .= "<script type='text/javascript' src='/directory/one.js?ver={$ver}' id='one-js'></script>\n"; 559 $expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' id='two-js'></script>\n"; 560 $expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' id='three-js'></script>\n"; 561 561 562 562 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 582 582 $ver = get_bloginfo( 'version' ); 583 583 $expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&load%5Bchunk_0%5D=one&ver={$ver}'></script>\n"; 584 $expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' ></script>\n";585 $expected .= "<script type='text/javascript' >\nconsole.log(\"after two\");\n</script>\n";586 $expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' ></script>\n";587 $expected .= "<script type='text/javascript' >\nconsole.log(\"after three\");\n</script>\n";588 $expected .= "<script type='text/javascript' src='/directory/four.js?ver={$ver}' ></script>\n";584 $expected .= "<script type='text/javascript' src='/directory/two.js?ver={$ver}' id='two-js'></script>\n"; 585 $expected .= "<script type='text/javascript' id='two-js-after'>\nconsole.log(\"after two\");\n</script>\n"; 586 $expected .= "<script type='text/javascript' src='/directory/three.js?ver={$ver}' id='three-js'></script>\n"; 587 $expected .= "<script type='text/javascript' id='three-js-after'>\nconsole.log(\"after three\");\n</script>\n"; 588 $expected .= "<script type='text/javascript' src='/directory/four.js?ver={$ver}' id='four-js'></script>\n"; 589 589 590 590 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 601 601 602 602 $expected_localized = "<!--[if gte IE 9]>\n"; 603 $expected_localized .= "<script type='text/javascript' >\n/* <![CDATA[ */\nvar testExample = {\"foo\":\"bar\"};\n/* ]]> */\n</script>\n";603 $expected_localized .= "<script type='text/javascript' id='test-example-js-extra'>\n/* <![CDATA[ */\nvar testExample = {\"foo\":\"bar\"};\n/* ]]> */\n</script>\n"; 604 604 $expected_localized .= "<![endif]-->\n"; 605 605 606 606 $expected = "<!--[if gte IE 9]>\n"; 607 $expected .= "<script type='text/javascript' >\nconsole.log(\"before\");\n</script>\n";608 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";609 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";607 $expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n"; 608 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 609 $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n"; 610 610 $expected .= "<![endif]-->\n"; 611 611 … … 634 634 $ver = get_bloginfo( 'version' ); 635 635 $expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&load%5Bchunk_0%5D=jquery-core,jquery-migrate&ver={$ver}'></script>\n"; 636 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";637 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";636 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 637 $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n"; 638 638 639 639 wp_enqueue_script( 'test-example', 'http://example.com', array( 'jquery' ), null ); … … 660 660 $expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&load%5Bchunk_0%5D=jquery-core,jquery-migrate&ver={$ver}'></script>\n"; 661 661 $expected .= "<!--[if gte IE 9]>\n"; 662 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";663 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";662 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 663 $expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n"; 664 664 $expected .= "<![endif]-->\n"; 665 665 … … 688 688 $ver = get_bloginfo( 'version' ); 689 689 $expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&load%5Bchunk_0%5D=jquery-core,jquery-migrate&ver={$ver}'></script>\n"; 690 $expected .= "<script type='text/javascript' >\nconsole.log(\"before\");\n</script>\n";691 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";690 $expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n"; 691 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 692 692 693 693 wp_enqueue_script( 'test-example', 'http://example.com', array( 'jquery' ), null ); … … 714 714 $ver = get_bloginfo( 'version' ); 715 715 $expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&load%5Bchunk_0%5D=jquery-core,jquery-migrate&ver={$ver}'></script>\n"; 716 $expected .= "<script type='text/javascript' >\nconsole.log(\"before\");\n</script>\n";717 $expected .= "<script type='text/javascript' src='http://example.com' ></script>\n";718 $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/vendor/wp-polyfill.min.js' ></script>\n";719 $expected .= "<script type='text/javascript' >\n";716 $expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n"; 717 $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n"; 718 $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/vendor/wp-polyfill.min.js' id='wp-polyfill-js'></script>\n"; 719 $expected .= "<script type='text/javascript' id='wp-polyfill-js-after'>\n"; 720 720 $expected .= "( 'fetch' in window ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-fetch.min.js\"></scr' + 'ipt>' );( document.contains ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-node-contains.min.js\"></scr' + 'ipt>' );( window.DOMRect ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-dom-rect.min.js\"></scr' + 'ipt>' );( window.URL && window.URL.prototype && window.URLSearchParams ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-url.min.js\"></scr' + 'ipt>' );( window.FormData && window.FormData.prototype.keys ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-formdata.min.js\"></scr' + 'ipt>' );( Element.prototype.matches && Element.prototype.closest ) || document.write( '<script src=\"http://example.org/wp-includes/js/dist/vendor/wp-polyfill-element-closest.min.js\"></scr' + 'ipt>' );\n"; 721 721 $expected .= "</script>\n"; 722 $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/dom-ready.min.js' ></script>\n";723 $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/i18n.min.js' ></script>\n";724 $expected .= "<script type='text/javascript' >\n";722 $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/dom-ready.min.js' id='wp-dom-ready-js'></script>\n"; 723 $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/i18n.min.js' id='wp-i18n-js'></script>\n"; 724 $expected .= "<script type='text/javascript' id='wp-a11y-js-translations'>\n"; 725 725 $expected .= "( function( domain, translations ) {\n"; 726 726 $expected .= " var localeData = translations.locale_data[ domain ] || translations.locale_data.messages;\n"; … … 729 729 $expected .= "} )( \"default\", { \"locale_data\": { \"messages\": { \"\": {} } } } );\n"; 730 730 $expected .= "</script>\n"; 731 $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/a11y.min.js' ></script>\n";732 $expected .= "<script type='text/javascript' src='http://example2.com' ></script>\n";733 $expected .= "<script type='text/javascript' >\nconsole.log(\"after\");\n</script>\n";731 $expected .= "<script type='text/javascript' src='/wp-includes/js/dist/a11y.min.js' id='wp-a11y-js'></script>\n"; 732 $expected .= "<script type='text/javascript' src='http://example2.com' id='test-example2-js'></script>\n"; 733 $expected .= "<script type='text/javascript' id='test-example2-js-after'>\nconsole.log(\"after\");\n</script>\n"; 734 734 735 735 wp_enqueue_script( 'test-example', 'http://example.com', array( 'jquery' ), null ); … … 768 768 $wp_scripts->do_concat = true; 769 769 770 $expected_tail = "<script type='text/javascript' src='/customize-dependency.js' ></script>\n";771 $expected_tail .= "<script type='text/javascript' >\n";770 $expected_tail = "<script type='text/javascript' src='/customize-dependency.js' id='customize-dependency-js'></script>\n"; 771 $expected_tail .= "<script type='text/javascript' id='customize-dependency-js-after'>\n"; 772 772 $expected_tail .= "tryCustomizeDependency()\n"; 773 773 $expected_tail .= "</script>\n"; … … 780 780 $print_scripts .= get_echo( '_print_scripts' ); 781 781 782 $tail = substr( $print_scripts, strrpos( $print_scripts, "<script type='text/javascript' src='/customize-dependency.js' >" ) );782 $tail = substr( $print_scripts, strrpos( $print_scripts, "<script type='text/javascript' src='/customize-dependency.js' id='customize-dependency-js'>" ) ); 783 783 $this->assertEquals( $expected_tail, $tail ); 784 784 } … … 800 800 801 801 $ver = get_bloginfo( 'version' ); 802 $expected = "<script type='text/javascript' src='/wp-includes/js/script.js?ver={$ver}' ></script>\n";803 $expected .= "<script type='text/javascript' >\nconsole.log(\"after one\");\n</script>\n";804 $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js?ver={$ver}' ></script>\n";805 $expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$ver}' ></script>\n";806 $expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$ver}' ></script>\n";802 $expected = "<script type='text/javascript' src='/wp-includes/js/script.js?ver={$ver}' id='one-js'></script>\n"; 803 $expected .= "<script type='text/javascript' id='one-js-after'>\nconsole.log(\"after one\");\n</script>\n"; 804 $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js?ver={$ver}' id='two-js'></script>\n"; 805 $expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$ver}' id='three-js'></script>\n"; 806 $expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$ver}' id='four-js'></script>\n"; 807 807 808 808 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 826 826 $ver = get_bloginfo( 'version' ); 827 827 $expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&load%5Bchunk_0%5D=one,two&ver={$ver}'></script>\n"; 828 $expected .= "<script type='text/javascript' >\nconsole.log(\"before three\");\n</script>\n";829 $expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$ver}' ></script>\n";830 $expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$ver}' ></script>\n";828 $expected .= "<script type='text/javascript' id='three-js-before'>\nconsole.log(\"before three\");\n</script>\n"; 829 $expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$ver}' id='three-js'></script>\n"; 830 $expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$ver}' id='four-js'></script>\n"; 831 831 832 832 $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) ); … … 841 841 wp_set_script_translations( 'test-example', 'default', DIR_TESTDATA . '/languages' ); 842 842 843 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' ></script>\n";843 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' id='wp-i18n-js'></script>\n"; 844 844 $expected .= str_replace( 845 845 array( 846 846 '__DOMAIN__', 847 '__HANDLE__', 847 848 '__JSON_TRANSLATIONS__', 848 849 ), 849 850 array( 850 851 'default', 852 'test-example', 851 853 file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ), 852 854 ), 853 855 $this->wp_scripts_print_translations_output 854 856 ); 855 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' ></script>\n";857 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' id='test-example-js'></script>\n"; 856 858 857 859 $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) ); … … 866 868 wp_set_script_translations( 'plugin-example', 'internationalized-plugin', DIR_TESTDATA . '/languages/plugins' ); 867 869 868 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' ></script>\n";870 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' id='wp-i18n-js'></script>\n"; 869 871 $expected .= str_replace( 870 872 array( 871 873 '__DOMAIN__', 874 '__HANDLE__', 872 875 '__JSON_TRANSLATIONS__', 873 876 ), 874 877 array( 875 878 'internationalized-plugin', 879 'plugin-example', 876 880 file_get_contents( DIR_TESTDATA . '/languages/plugins/internationalized-plugin-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ), 877 881 ), 878 882 $this->wp_scripts_print_translations_output 879 883 ); 880 $expected .= "<script type='text/javascript' src='/wp-content/plugins/my-plugin/js/script.js' ></script>\n";884 $expected .= "<script type='text/javascript' src='/wp-content/plugins/my-plugin/js/script.js' id='plugin-example-js'></script>\n"; 881 885 882 886 $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) ); … … 891 895 wp_set_script_translations( 'theme-example', 'internationalized-theme', DIR_TESTDATA . '/languages/themes' ); 892 896 893 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' ></script>\n";897 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' id='wp-i18n-js'></script>\n"; 894 898 $expected .= str_replace( 895 899 array( 896 900 '__DOMAIN__', 901 '__HANDLE__', 897 902 '__JSON_TRANSLATIONS__', 898 903 ), 899 904 array( 900 905 'internationalized-theme', 906 'theme-example', 901 907 file_get_contents( DIR_TESTDATA . '/languages/themes/internationalized-theme-en_US-2f86cb96a0233e7cb3b6f03ad573be0b.json' ), 902 908 ), 903 909 $this->wp_scripts_print_translations_output 904 910 ); 905 $expected .= "<script type='text/javascript' src='/wp-content/themes/my-theme/js/script.js' ></script>\n";911 $expected .= "<script type='text/javascript' src='/wp-content/themes/my-theme/js/script.js' id='theme-example-js'></script>\n"; 906 912 907 913 $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) ); … … 916 922 wp_set_script_translations( 'script-handle', 'admin', DIR_TESTDATA . '/languages/' ); 917 923 918 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' ></script>\n";924 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' id='wp-i18n-js'></script>\n"; 919 925 $expected .= str_replace( 920 926 array( 921 927 '__DOMAIN__', 928 '__HANDLE__', 922 929 '__JSON_TRANSLATIONS__', 923 930 ), 924 931 array( 925 932 'admin', 933 'script-handle', 926 934 file_get_contents( DIR_TESTDATA . '/languages/admin-en_US-script-handle.json' ), 927 935 ), 928 936 $this->wp_scripts_print_translations_output 929 937 ); 930 $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js' ></script>\n";938 $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js' id='script-handle-js'></script>\n"; 931 939 932 940 $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) ); … … 956 964 wp_set_script_translations( 'test-example', 'admin', DIR_TESTDATA . '/languages/' ); 957 965 958 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' ></script>\n";966 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' id='wp-i18n-js'></script>\n"; 959 967 $expected .= str_replace( 960 968 array( 961 969 '__DOMAIN__', 970 '__HANDLE__', 962 971 '__JSON_TRANSLATIONS__', 963 972 ), 964 973 array( 965 974 'admin', 975 'test-example', 966 976 '{ "locale_data": { "messages": { "": {} } } }', 967 977 ), 968 978 $this->wp_scripts_print_translations_output 969 979 ); 970 $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js' ></script>\n";980 $expected .= "<script type='text/javascript' src='/wp-admin/js/script.js' id='test-example-js'></script>\n"; 971 981 972 982 $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) ); … … 983 993 wp_enqueue_script( 'test-example' ); 984 994 985 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' ></script>\n";995 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' id='wp-i18n-js'></script>\n"; 986 996 $expected .= str_replace( 987 997 array( 988 998 '__DOMAIN__', 999 '__HANDLE__', 989 1000 '__JSON_TRANSLATIONS__', 990 1001 ), 991 1002 array( 992 1003 'default', 1004 'test-example', 993 1005 file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ), 994 1006 ), 995 1007 $this->wp_scripts_print_translations_output 996 1008 ); 997 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' ></script>\n";1009 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' id='test-example-js'></script>\n"; 998 1010 999 1011 $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) ); … … 1010 1022 wp_enqueue_script( 'test-example', '/wp-includes/js/script2.js', array( 'test-dependency' ), null ); 1011 1023 1012 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' ></script>\n";1024 $expected = "<script type='text/javascript' src='/wp-includes/js/dist/wp-i18n.js' id='wp-i18n-js'></script>\n"; 1013 1025 $expected .= str_replace( 1014 1026 array( 1015 1027 '__DOMAIN__', 1028 '__HANDLE__', 1016 1029 '__JSON_TRANSLATIONS__', 1017 1030 ), 1018 1031 array( 1019 1032 'default', 1033 'test-dependency', 1020 1034 file_get_contents( DIR_TESTDATA . '/languages/en_US-813e104eb47e13dd4cc5af844c618754.json' ), 1021 1035 ), 1022 1036 $this->wp_scripts_print_translations_output 1023 1037 ); 1024 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' ></script>\n";1025 $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js' ></script>\n";1038 $expected .= "<script type='text/javascript' src='/wp-includes/js/script.js' id='test-dependency-js'></script>\n"; 1039 $expected .= "<script type='text/javascript' src='/wp-includes/js/script2.js' id='test-example-js'></script>\n"; 1026 1040 1027 1041 $this->assertEqualsIgnoreEOL( $expected, get_echo( 'wp_print_scripts' ) );
Note: See TracChangeset
for help on using the changeset viewer.