Ticket #37110: 37110.7.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/admin/user-profile.js

@@ -339 +339 @@
                 });
 
                 if ( select.length ) {
-                        $('#first_name, #last_name, #nickname').bind( 'blur.user_profile', function() {
+                        $('#first_name, #last_name, #nickname').on( 'blur.user_profile', function() {
                                 var dub = [],
                                         inputs = {
                                                 display_nickname  : $('#nickname').val() || '',

src/js/_enqueues/admin/xfn.js

@@ -5 +5 @@
  */
 jQuery( document ).ready(function( $ ) {
         $( '#link_rel' ).prop( 'readonly', true );
-        $( '#linkxfndiv input' ).bind( 'click keyup', function() {
+        $( '#linkxfndiv input' ).on( 'click keyup', function() {
                 var isMe = $( '#me' ).is( ':checked' ), inputs = '';
                 $( 'input.valinp' ).each( function() {
                         if ( isMe ) {

src/js/_enqueues/deprecated/media-gallery.js

@@ -8 +8 @@
         /**
          * Adds a click event handler to the element with a 'wp-gallery' class.
          */
-        $( 'body' ).bind( 'click.wp-gallery', function(e) {
+        $( 'body' ).on( 'click.wp-gallery', function(e) {
                 var target = $( e.target ), id, img_size;
 
                 if ( target.hasClass( 'wp-set-header' ) ) {

src/js/_enqueues/lib/nav-menu.js

@@ -1050 +1050 @@
                                 };
                         } else {
                                 // Make the post boxes read-only, as they can't be used yet
-                                $( '#menu-settings-column' ).find( 'input,select' ).end().find( 'a' ).attr( 'href', '#' ).unbind( 'click' );
+                                $( '#menu-settings-column' ).find( 'input,select' ).end().find( 'a' ).attr( 'href', '#' ).off( 'click' );
                         }
                 },
 

src/js/_enqueues/lib/pointer.js

@@ -20 +20 @@
                                 var close  = ( wpPointerL10n ) ? wpPointerL10n.dismiss : 'Dismiss',
                                         button = $('<a class="close" href="#">' + close + '</a>');
 
-                                return button.bind( 'click.pointer', function(e) {
+                                return button.on( 'click.pointer', function(e) {
                                         e.preventDefault();
                                         t.element.pointer('close');
                                 });

src/js/_enqueues/vendor/plupload/handlers.js

@@ -426 +426 @@
 
                 uploader = new plupload.Uploader(wpUploaderInit);
 
-                $('#image_resize').bind('change', function() {
+                $('#image_resize').on('change', function() {
                         var arg = $(this).prop('checked');
 
                         setResize( arg );

src/js/_enqueues/wp/api.js

@@ -390 +390 @@
                                 if ( ! getModel.get( embedCheckField ) ) {
                                         getModel.fetch( {
                                                 success: function( getModel ) {
-                                                        deferred.resolve( getModel );
+                                                        deferred.resolveWith( deferred, getModel );
                                                 },
                                                 error: function( getModel, response ) {
-                                                        deferred.reject( response );
+                                                        deferred.rejectWith( deferred, response );
                                                 }
                                         } );
                                 } else {
                                         // Resolve with the embedded model.
-                                        deferred.resolve( getModel );
+                                        deferred.resolveWith( deferred, getModel );
                                 }
 
                                 // Return a promise.

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/js/_enqueues/wp/util.js

@@ -85 +85 @@
                         options = _.defaults( options || {}, {
                                 type:    'POST',
                                 url:     wp.ajax.settings.url,
-                                context: this
+                                context: this,
+                                dataType: 'script'
                         });
 
                         deferred = $.Deferred( function( deferred ) {

src/wp-admin/includes/class-wp-internal-pointers.php

@@ -135 +135 @@
                         };
 
                         if ( options.position && options.position.defer_loading )
-                                $(window).bind( 'load.wp-pointers', setup );
+                                $(window).on( 'load.wp-pointers', setup );
                         else
-                                $(document).ready( setup );
+                                $(document)on( 'ready', setup );
 
                 })( jQuery );
                 </script>

src/wp-content/themes/twentyfourteen/js/slider.js

@@ -72 +72 @@
 
                                 // KEYBOARD
                                 if ( $( slider.containerSelector ).length === 1 ) {
-                                        $( document ).bind( 'keyup', function( event ) {
+                                        $( document ).on( 'keyup', function( event ) {
                                                 var keycode = event.keyCode,
                                                         target = false;
                                                 if ( ! slider.animating && ( keycode === 39 || keycode === 37 ) ) {
@@ -92 +92 @@
                                         methods.touch();
                                 }
 
-                                $( window ).bind( 'resize orientationchange focus', methods.resize );
+                                $( window ).on( 'resize orientationchange focus', methods.resize );
 
                                 slider.find( 'img' ).attr( 'draggable', 'false' );
                         },
@@ -423 +423 @@
                                                 slider.animating = false;
                                                 slider.currentSlide = slider.animatingTo;
                                         }
-                                        slider.container.unbind( 'webkitTransitionEnd transitionend' );
-                                        slider.container.bind( 'webkitTransitionEnd transitionend', function() {
+                                        slider.container.off( 'webkitTransitionEnd transitionend' );
+                                        slider.container.on( 'webkitTransitionEnd transitionend', function() {
                                                 slider.wrapup( dimension );
                                         } );
                                 } else {

src/wp-content/themes/twentyseventeen/assets/js/customize-controls.js

@@ -6 +6 @@
  */
 
 (function() {
-        wp.customize.bind( 'ready', function() {
+        wp.customize.on( 'ready', function() {
 
                 // Only show the color hue control when there's a custom color scheme.
                 wp.customize( 'colorscheme', function( setting ) {

src/wp-content/themes/twentyseventeen/assets/js/navigation.js

@@ -93 +93 @@
                                         });
 
                         } else {
-                                siteNavigation.find( '.menu-item-has-children > a, .page_item_has_children > a' ).unbind( 'touchstart.twentyseventeen' );
+                                siteNavigation.find( '.menu-item-has-children > a, .page_item_has_children > a' ).off( 'touchstart.twentyseventeen' );
                         }
                 }
 

src/wp-content/themes/twentysixteen/js/functions.js

@@ -94 +94 @@
                                         }
                                 } );
                         } else {
-                                siteNavigation.find( '.menu-item-has-children > a' ).unbind( 'touchstart.twentysixteen' );
+                                siteNavigation.find( '.menu-item-has-children > a' ).off( 'touchstart.twentysixteen' );
                         }
                 }
 

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/index.html

@@ -13 +13 @@
                 <script>
                         window._wpUtilSettings = {
                                 'ajax': {
-                                        'url': '\/wp-admin\/admin-ajax.php'
+                                        'url': 'http:\/\/localhost\/wp-admin\/admin-ajax.php'
                                 }
                         };
                 </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,

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;