Ticket #37110: 37110.9.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

@@ -1104 +1104 @@
                                 return;
                         }
 
-                        duration = ( 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 );
+                        duration = ( api.previewer && 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 );
 
                         if ( construct.extended( api.Panel ) ) {
                                 // If this is a panel is not currently expanded but another panel is expanded, do not animate.

src/js/_enqueues/wp/customize/widgets.js

@@ -1688 +1688 @@
                                         noticeContainer.toggle( shouldShowNotice() );
                                 });
                                 api.bind( 'pane-contents-reflowed', function() {
-                                        var duration = ( 'resolved' === api.previewer.deferred.active.state() ) ? 'fast' : 0;
+                                        var duration = ( api.previewer && 'resolved' === api.previewer.deferred.active.state() ) ? 'fast' : 0;
                                         updateNotice();
                                         if ( shouldShowNotice() ) {
                                                 noticeContainer.slideDown( duration );

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

@@ -6 +6 @@
         }
 });
 
-jQuery( window ).load( function (){
+jQuery( document ).ready( function (){
         'use strict';
 
         var controlId, controlLabel, controlType, controlContent, controlDescription, controlData, mockControl,

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

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

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

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