Ticket #37110: 37110.6.diff

package.json

@@ -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",
-                "jquery-ui": "github:jquery/jquery-ui#1.11.4",
+                "jquery-ui": "github:jquery/jquery-ui#1.12.1",
                 "masonry-layout": "3.3.2",
                 "twemoji": "2.5.1",
                 "underscore": "1.8.3"

src/js/_enqueues/wp/customize/base.js

@@ -592 +592 @@
                         };
 
                         this.bind( this.update );
-                        this.element.bind( this.events, this.refresh );
+                        this.element.on( this.events, this.refresh );
                 },
 
                 find: function( selector ) {

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/nav-menus.js

@@ -221 +221 @@
                         });
 
                         // Load available items if it looks like we'll need them.
-                        api.panel( 'nav_menus' ).container.bind( 'expanded', function() {
+                        api.panel( 'nav_menus' ).container.on( 'expanded', function() {
                                 if ( ! self.rendered ) {
                                         self.initList();
                                         self.rendered = true;

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', false, array( 'jquery-core', 'jquery-migrate' ), '3.0.0' );
+        $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '3.2.1' );
+        $scripts->add( 'jquery-legacy', '/wp-includes/js/jquery/jquery-legacy.js', array(), '1.12.4' );
         $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );
 
         // full jQuery UI

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,

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,
@@ -79 +79 @@
                 control = section.controls()[0];
                 ok( control.extended( api.Menus.MenuNameControl ), 'control is a MenuNameControl' );
                 equal( control.setting().name, 'Primary menu' );
-                ok( ! control.setting._dirty );
+                ok( ! control.setting.dirty, 'control not dirty' );
                 control.container.find( 'input[type=text]:first' ).val( 'Main menu' ).trigger( 'change' );
                 equal( control.setting().name, 'Main menu' );
-                ok( control.setting._dirty );
+                ok( control.setting.dirty, 'control dirty' );
         } );
         // @todo Add more tests for api.Menus.MenuNameControl
 

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;