Ticket #37110: 37110.11.diff

package-lock.json

@@ -6502 +6502 @@
                         }
                 },
                 "jquery": {
-                        "version": "1.12.4",
-                        "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz",
-                        "integrity": "sha1-AeHfuikP5z3rp3zurLD5ui/sngw="
+                        "version": "3.3.1",
+                        "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+                        "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
                 },
                 "jquery-color": {
                         "version": "github:jquery/jquery-color#95402e5b2f1184ab2de7014aeef0a90f2bee0a40",
@@ -6527 +6527 @@
                         }
                 },
                 "jquery-migrate": {
-                        "version": "1.4.1",
-                        "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.1.tgz",
-                        "integrity": "sha1-hRUvPsmalWJfT30Lz2LpuGOPWnY=",
+                        "version": "3.0.1",
+                        "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.0.1.tgz",
+                        "integrity": "sha512-NYlhcFnRh4Bv9jvadPlcAKQdVGRE0+TSgFYxQ+ZnCxUUHbwd+SjbOg+Xvu1Oea9mpQJ+2VB1eCfcBORWNQsHaA==",
                         "dev": true
                 },
                 "jquery-ui": {

package.json

@@ -39 +39 @@
                 "grunt-sass": "2.0.0",
                 "grunt-webpack": "^3.0.2",
                 "ink-docstrap": "^1.3.0",
-                "jquery-migrate": "1.4.1",
+                "jquery-migrate": "3.0.1",
                 "matchdep": "~1.0.0",
                 "webpack": "^3.6.0",
                 "webpack-dev-server": "^2.9.1"
@@ -47 +47 @@
         "dependencies": {
                 "backbone": "1.3.3",
                 "imagesloaded": "3.2.0",
-                "jquery": "1.12.4",
+                "jquery": "3.3.1",
                 "jquery-color": "github:jquery/jquery-color#2.1.1",
                 "jquery-form": "4.2.1",
                 "jquery-hoverintent": "1.8.3",

src/js/_enqueues/wp/customize/controls.js

@@ -7094 +7094 @@
                 api.state.create( name );
         });
 
-        $( function() {
+        /**
+         * Function which boots the Customizer controls app. This should be done at DOMContentLoaded.
+         *
+         * @since 5.0
+         */
+        api.ready = function ready() {
                 api.settings = window._wpCustomizeSettings;
                 api.l10n = window._wpCustomizeControlsL10n;
 
@@ -9264 +9269 @@
 
                 body.addClass( 'ready' );
                 api.trigger( 'ready' );
-        });
+        };
 
 })( wp, jQuery );

src/wp-includes/script-loader.php

@@ -207 +207 @@
         $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array( 'scriptaculous-dragdrop' ) );
 
         // jQuery
-        $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4' );
-        $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4' );
-        $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );
+        $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '3.3.1' );
+        $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '3.3.1' );
+        $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '3.0.1' );
 
         // full jQuery UI
         $scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
@@ -582 +582 @@
         $scripts->add( 'customize-models', '/wp-includes/js/customize-models.js', array( 'underscore', 'backbone' ), false, 1 );
         $scripts->add( 'customize-views', '/wp-includes/js/customize-views.js', array( 'jquery', 'underscore', 'imgareaselect', 'customize-models', 'media-editor', 'media-views' ), false, 1 );
         $scripts->add( 'customize-controls', "/wp-admin/js/customize-controls$suffix.js", array( 'customize-base', 'wp-a11y', 'wp-util', 'jquery-ui-core' ), false, 1 );
+        did_action( 'init' ) && $scripts->add_inline_script( 'customize-controls', 'document.addEventListener( "DOMContentLoaded", wp.customize.ready );' );
         did_action( 'init' ) && $scripts->localize(
                 'customize-controls', '_wpCustomizeControlsL10n', array(
                         'activate'                => __( 'Activate & Publish' ),

tests/qunit/index.html

@@ -77 +77 @@
                 <script src="../../build/wp-includes/js/customize-models.js"></script>
                 <script src="../../build/wp-includes/js/shortcode.js"></script>
                 <script src="../../build/wp-admin/js/customize-controls.js"></script>
+                <script>
+                        document.addEventListener( 'DOMContentLoaded', wp.customize.ready );
+                </script>
                 <script src="../../build/wp-includes/js/api-request.js"></script>
                 <script src="../../build/wp-includes/js/wp-api.js"></script>
 

tests/qunit/wp-admin/js/customize-controls.js

@@ -6 +6 @@
         }
 });
 
-jQuery( window ).load( function (){
+jQuery( window ).on( 'load', function () {
         'use strict';
 
         var controlId, controlLabel, controlType, controlContent, controlDescription, controlData, mockControl,
@@ -430 +430 @@
         settingId = 'new_blogname';
         settingValue = 'Hello World';
 
-        test( 'Create a new setting', function () {
-                mockSetting = wp.customize.create(
+        function createMockSetting() {
+                if ( wp.customize.has( settingId ) ) {
+                        return wp.customize( settingId );
+                }
+                return wp.customize.create(
                         settingId,
                         settingId,
                         settingValue,
@@ -440 +443 @@
                                 previewer: wp.customize.previewer
                         }
                 );
+        }
+
+        test( 'Create a new setting', function () {
+                mockSetting = createMockSetting();
                 equal( mockSetting(), settingValue );
                 equal( mockSetting.id, settingId );
         } );
@@ -546 +553 @@
                 mockControl.section( mockSection.id );
                 equal( mockControl.section(), mockSection.id );
         });
-        test( 'Associating a control with a section allows it to be embedded', function () {
-                equal( mockControl.deferred.embedded.state(), 'resolved' );
+        test( 'Associating a control with a section allows it to be embedded', function ( assert ) {
+                createMockSetting(); // In case this test is being tested in isolation.
+                mockControl.section( mockSection.id );
+                ok( wp.customize.has( 'new_blogname' ) );
+                equal( mockControl.deferred.embedded.state(), 'resolved' ); // @todo Why is this not resolved?
         });
 
         test( 'Control is now available on section.controls()', function () {

tests/qunit/wp-admin/js/customize-nav-menus.js

@@ -1 +1 @@
 /* global wp */
-jQuery( window ).load( function (){
+jQuery( window ).on( 'load', function () {
 
         var api = wp.customize,
                 primaryMenuId = 3,

tests/qunit/wp-admin/js/customize-widgets.js

@@ -1 +1 @@
 /* global wp */
-jQuery( window ).load( function() {
+jQuery( window ).on( 'load', function () {
 
         var api = wp.customize, $ = jQuery;