WordPress.org

Make WordPress Core

Ticket #37110: 37110.6.diff

File 37110.6.diff, 4.9 KB (added by adamsilverstein, 19 months ago)
  • package.json

    diff --git package.json package.json
    index 96aa92a301..2a568e5084 100644
     
    4747        "dependencies": {
    4848                "backbone": "1.3.3",
    4949                "imagesloaded": "3.2.0",
    50                 "jquery": "1.12.4",
     50                "jquery": "3.3.1",
    5151                "jquery-color": "github:jquery/jquery-color#2.1.1",
    5252                "jquery-form": "4.2.1",
    5353                "jquery-hoverintent": "1.8.3",
    54                 "jquery-ui": "github:jquery/jquery-ui#1.11.4",
     54                "jquery-ui": "github:jquery/jquery-ui#1.12.1",
    5555                "masonry-layout": "3.3.2",
    5656                "twemoji": "2.5.1",
    5757                "underscore": "1.8.3"
  • src/js/_enqueues/wp/customize/base.js

    diff --git src/js/_enqueues/wp/customize/base.js src/js/_enqueues/wp/customize/base.js
    index 374f50300e..9af48b8ffd 100644
    window.wp = window.wp || {}; 
    592592                        };
    593593
    594594                        this.bind( this.update );
    595                         this.element.bind( this.events, this.refresh );
     595                        this.element.on( this.events, this.refresh );
    596596                },
    597597
    598598                find: function( selector ) {
  • src/js/_enqueues/wp/customize/controls.js

    diff --git src/js/_enqueues/wp/customize/controls.js src/js/_enqueues/wp/customize/controls.js
    index ed75ba3df1..2bebc3cbe9 100644
     
    11041104                                return;
    11051105                        }
    11061106
    1107                         duration = ( 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 );
     1107                        duration = ( api.previewer && 'resolved' === api.previewer.deferred.active.state() ? args.duration : 0 );
    11081108
    11091109                        if ( construct.extended( api.Panel ) ) {
    11101110                                // 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

    diff --git src/js/_enqueues/wp/customize/nav-menus.js src/js/_enqueues/wp/customize/nav-menus.js
    index db846baaf2..3d477e5c7b 100644
     
    221221                        });
    222222
    223223                        // Load available items if it looks like we'll need them.
    224                         api.panel( 'nav_menus' ).container.bind( 'expanded', function() {
     224                        api.panel( 'nav_menus' ).container.on( 'expanded', function() {
    225225                                if ( ! self.rendered ) {
    226226                                        self.initList();
    227227                                        self.rendered = true;
  • src/wp-includes/script-loader.php

    diff --git src/wp-includes/script-loader.php src/wp-includes/script-loader.php
    index 12421811b6..22e08bf3bd 100644
    function wp_default_scripts( &$scripts ) { 
    207207        $scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array( 'scriptaculous-dragdrop' ) );
    208208
    209209        // jQuery
    210         $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4' );
    211         $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4' );
     210        $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '3.0.0' );
     211        $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '3.2.1' );
     212        $scripts->add( 'jquery-legacy', '/wp-includes/js/jquery/jquery-legacy.js', array(), '1.12.4' );
    212213        $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );
    213214
    214215        // full jQuery UI
  • tests/qunit/wp-admin/js/customize-controls.js

    diff --git tests/qunit/wp-admin/js/customize-controls.js tests/qunit/wp-admin/js/customize-controls.js
    index 47ab5c0203..867c5a5a5c 100644
    wp.customize.settingConstructor.abbreviation = wp.customize.Setting.extend({ 
    66        }
    77});
    88
    9 jQuery( window ).load( function (){
     9jQuery( window ).on( 'load', function (){
    1010        'use strict';
    1111
    1212        var controlId, controlLabel, controlType, controlContent, controlDescription, controlData, mockControl,
  • tests/qunit/wp-admin/js/customize-nav-menus.js

    diff --git tests/qunit/wp-admin/js/customize-nav-menus.js tests/qunit/wp-admin/js/customize-nav-menus.js
    index 3ac6da8662..ab8d6642b6 100644
     
    11/* global wp */
    2 jQuery( window ).load( function (){
     2jQuery( window ).on( 'load', function (){
    33
    44        var api = wp.customize,
    55                primaryMenuId = 3,
    jQuery( window ).load( function (){ 
    7979                control = section.controls()[0];
    8080                ok( control.extended( api.Menus.MenuNameControl ), 'control is a MenuNameControl' );
    8181                equal( control.setting().name, 'Primary menu' );
    82                 ok( ! control.setting._dirty );
     82                ok( ! control.setting.dirty, 'control not dirty' );
    8383                control.container.find( 'input[type=text]:first' ).val( 'Main menu' ).trigger( 'change' );
    8484                equal( control.setting().name, 'Main menu' );
    85                 ok( control.setting._dirty );
     85                ok( control.setting.dirty, 'control dirty' );
    8686        } );
    8787        // @todo Add more tests for api.Menus.MenuNameControl
    8888
  • tests/qunit/wp-admin/js/customize-widgets.js

    diff --git tests/qunit/wp-admin/js/customize-widgets.js tests/qunit/wp-admin/js/customize-widgets.js
    index 5f754a497a..38bd093652 100644
     
    11/* global wp */
    2 jQuery( window ).load( function() {
     2jQuery( window ).on( 'load', function() {
    33
    44        var api = wp.customize, $ = jQuery;
    55