From ad297dab6d213251de05259a0b3fec174fe34c1f Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Tue, 2 Dec 2014 00:31:22 +0000 Subject: [PATCH] Correctly capitalize JavaScript throughout core docs. Fixes #30569. Built from https://develop.svn.wordpress.org/trunk@30695 git-svn-id: http://core.svn.wordpress.org/trunk@30685 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/nav-menus-rtl.css | 2 +- wp-admin/css/nav-menus.css | 2 +- wp-admin/custom-header.php | 6 +++--- wp-admin/customize.php | 4 ++-- wp-admin/includes/deprecated.php | 2 +- wp-admin/includes/revision.php | 2 +- wp-admin/includes/template.php | 4 ++-- wp-includes/class-wp-customize-manager.php | 4 ++-- wp-includes/class-wp-customize-widgets.php | 2 +- wp-includes/class-wp-editor.php | 2 +- wp-includes/comment-template.php | 2 +- wp-includes/deprecated.php | 4 ++-- wp-includes/js/shortcode.js | 2 +- wp-includes/post-template.php | 4 ++-- wp-includes/version.php | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/wp-admin/css/nav-menus-rtl.css b/wp-admin/css/nav-menus-rtl.css index 7acfd4d031..40bd5f9952 100644 --- a/wp-admin/css/nav-menus-rtl.css +++ b/wp-admin/css/nav-menus-rtl.css @@ -527,7 +527,7 @@ li.menu-item.ui-sortable-helper .menu-item-transport dl { margin-top: 13px; } -/* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */ +/* WARNING: The factor of 30px is hardcoded into the nav-menus JavaScript. */ .menu-item-depth-0 { margin-right: 0px; } .menu-item-depth-1 { margin-right: 30px; } .menu-item-depth-2 { margin-right: 60px; } diff --git a/wp-admin/css/nav-menus.css b/wp-admin/css/nav-menus.css index dd67f45851..2ac58e3209 100644 --- a/wp-admin/css/nav-menus.css +++ b/wp-admin/css/nav-menus.css @@ -527,7 +527,7 @@ li.menu-item.ui-sortable-helper .menu-item-transport dl { margin-top: 13px; } -/* WARNING: The factor of 30px is hardcoded into the nav-menus javascript. */ +/* WARNING: The factor of 30px is hardcoded into the nav-menus JavaScript. */ .menu-item-depth-0 { margin-left: 0px; } .menu-item-depth-1 { margin-left: 30px; } .menu-item-depth-2 { margin-left: 60px; } diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index 8f2a2d2988..0e5ffa6b38 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -362,7 +362,7 @@ class Custom_Image_Header { } /** - * Execute Javascript depending on step. + * Execute JavaScript depending on step. * * @since 2.1.0 */ @@ -375,7 +375,7 @@ class Custom_Image_Header { } /** - * Display Javascript based on Step 1 and 3. + * Display JavaScript based on Step 1 and 3. * * @since 2.6.0 */ @@ -439,7 +439,7 @@ class Custom_Image_Header { } /** - * Display Javascript based on Step 2. + * Display JavaScript based on Step 2. * * @since 2.6.0 */ diff --git a/wp-admin/customize.php b/wp-admin/customize.php index c78a7cb38d..ac74d32afd 100644 --- a/wp-admin/customize.php +++ b/wp-admin/customize.php @@ -232,7 +232,7 @@ do_action( 'customize_controls_print_scripts' ); 'customize-login' => 1 ), wp_login_url() ); - // Prepare Customizer settings to pass to Javascript. + // Prepare Customizer settings to pass to JavaScript. $settings = array( 'theme' => array( 'stylesheet' => $wp_customize->get_stylesheet(), @@ -265,7 +265,7 @@ do_action( 'customize_controls_print_scripts' ); 'documentTitleTmpl' => $document_title_tmpl, ); - // Prepare Customize Setting objects to pass to Javascript. + // Prepare Customize Setting objects to pass to JavaScript. foreach ( $wp_customize->settings() as $id => $setting ) { $settings['settings'][ $id ] = array( 'value' => $setting->js_value(), diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index 21e5203352..8ae6048edc 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -208,7 +208,7 @@ function codepress_get_lang( $filename ) { } /** - * Adds Javascript required to make CodePress work on the theme/plugin editors. + * Adds JavaScript required to make CodePress work on the theme/plugin editors. * * @since 2.8.0 * @deprecated 3.0.0 diff --git a/wp-admin/includes/revision.php b/wp-admin/includes/revision.php index 053ef09ab0..10d9520381 100644 --- a/wp-admin/includes/revision.php +++ b/wp-admin/includes/revision.php @@ -282,7 +282,7 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null } /** - * Print Javascript templates required for the revisions experience. + * Print JavaScript templates required for the revisions experience. * * @since 4.1.0 * diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index ad960319ce..c1cb697405 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -1608,7 +1608,7 @@ document.body.className = c; function iframe_footer() { /* * We're going to hide any footer output on iFrame pages, - * but run the hooks anyway since they output Javascript + * but run the hooks anyway since they output JavaScript * or other needed content. */ ?> @@ -1949,7 +1949,7 @@ final class WP_Internal_Pointers { } /** - * Print the pointer javascript data. + * Print the pointer JavaScript data. * * @since 3.3.0 * diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 6ad38bc4d7..e8b6198284 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -419,7 +419,7 @@ final class WP_Customize_Manager { } /** - * Print javascript settings. + * Print JavaScript settings. * * @since 3.4.0 */ @@ -492,7 +492,7 @@ final class WP_Customize_Manager { } /** - * Print javascript settings for preview frame. + * Print JavaScript settings for preview frame. * * @since 3.4.0 */ diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php index cc1aa9ea87..c3ae451a09 100644 --- a/wp-includes/class-wp-customize-widgets.php +++ b/wp-includes/class-wp-customize-widgets.php @@ -1041,7 +1041,7 @@ final class WP_Customize_Widgets { */ public function export_preview_data() { - // Prepare Customizer settings to pass to Javascript. + // Prepare Customizer settings to pass to JavaScript. $settings = array( 'renderedSidebars' => array_fill_keys( array_unique( $this->rendered_sidebars ), true ), 'renderedWidgets' => array_fill_keys( array_keys( $this->rendered_widgets ), true ), diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 03ddb27181..18eb45345d 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -759,7 +759,7 @@ final class _WP_Editors { * Can be used directly (_WP_Editors::wp_mce_translation()) by passing the same locale as set in the TinyMCE init object. * * @param string $mce_locale The locale used for the editor. - * @param bool $json_only optional Whether to include the Javascript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone(). + * @param bool $json_only optional Whether to include the JavaScript calls to tinymce.addI18n() and tinymce.ScriptLoader.markDone(). * @return string Translation object, JSON encoded. */ public static function wp_mce_translation( $mce_locale = '', $json_only = false ) { diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index f69137af6b..4e75e7bca8 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -1610,7 +1610,7 @@ function comment_id_fields( $id = 0 ) { /** * Display text based on comment reply status. * - * Only affects users with Javascript disabled. + * Only affects users with JavaScript disabled. * * @since 2.7.0 * diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index 7d3f2d4add..5ff82ef6a7 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -2501,7 +2501,7 @@ function funky_javascript_callback($matches) { } /** - * Fixes javascript bugs in browsers. + * Fixes JavaScript bugs in browsers. * * Converts unicode characters to HTML numbered entities. * @@ -2515,7 +2515,7 @@ function funky_javascript_callback($matches) { */ function funky_javascript_fix($text) { _deprecated_function( __FUNCTION__, '3.0' ); - // Fixes for browsers' javascript bugs + // Fixes for browsers' JavaScript bugs. global $is_macIE, $is_winIE; if ( $is_winIE || $is_macIE ) diff --git a/wp-includes/js/shortcode.js b/wp-includes/js/shortcode.js index 2d319213fa..34766fb651 100644 --- 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 || {}; diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 8dc249b55d..75a6eeaf2a 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -290,14 +290,14 @@ function get_the_content( $more_link_text = null, $strip_teaser = false ) { } } - if ( $preview ) // preview fix for javascript bug with foreign languages + if ( $preview ) // Preview fix for JavaScript bug with foreign languages. $output = preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output ); return $output; } /** - * Preview fix for javascript bug with foreign languages + * Preview fix for JavaScript bug with foreign languages. * * @since 3.1.0 * @access private diff --git a/wp-includes/version.php b/wp-includes/version.php index 7b9ee9f7cd..e36e5bddf7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30694'; +$wp_version = '4.1-beta2-30695'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.