WordPress.org

Make WordPress Core

Ticket #37110: 37110.9.diff

File 37110.9.diff, 4.3 KB (added by adamsilverstein, 18 months ago)
  • package-lock.json

    diff --git package-lock.json package-lock.json
    index 477488d18a..68dc453454 100644
     
    65026502                        }
    65036503                },
    65046504                "jquery": {
    6505                         "version": "1.12.4",
    6506                         "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz",
    6507                         "integrity": "sha1-AeHfuikP5z3rp3zurLD5ui/sngw="
     6505                        "version": "3.3.1",
     6506                        "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
     6507                        "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
    65086508                },
    65096509                "jquery-color": {
    65106510                        "version": "github:jquery/jquery-color#95402e5b2f1184ab2de7014aeef0a90f2bee0a40",
     
    65276527                        }
    65286528                },
    65296529                "jquery-migrate": {
    6530                         "version": "1.4.1",
    6531                         "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.1.tgz",
    6532                         "integrity": "sha1-hRUvPsmalWJfT30Lz2LpuGOPWnY=",
     6530                        "version": "3.0.1",
     6531                        "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.0.1.tgz",
     6532                        "integrity": "sha512-NYlhcFnRh4Bv9jvadPlcAKQdVGRE0+TSgFYxQ+ZnCxUUHbwd+SjbOg+Xvu1Oea9mpQJ+2VB1eCfcBORWNQsHaA==",
    65336533                        "dev": true
    65346534                },
    65356535                "jquery-ui": {
  • package.json

    diff --git package.json package.json
    index 96aa92a301..06a4c70525 100644
     
    3939                "grunt-sass": "2.0.0",
    4040                "grunt-webpack": "^3.0.2",
    4141                "ink-docstrap": "^1.3.0",
    42                 "jquery-migrate": "1.4.1",
     42                "jquery-migrate": "3.0.1",
    4343                "matchdep": "~1.0.0",
    4444                "webpack": "^3.6.0",
    4545                "webpack-dev-server": "^2.9.1"
     
    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",
  • 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/widgets.js

    diff --git src/js/_enqueues/wp/customize/widgets.js src/js/_enqueues/wp/customize/widgets.js
    index 40b514876b..13e0c33f24 100644
     
    16881688                                        noticeContainer.toggle( shouldShowNotice() );
    16891689                                });
    16901690                                api.bind( 'pane-contents-reflowed', function() {
    1691                                         var duration = ( 'resolved' === api.previewer.deferred.active.state() ) ? 'fast' : 0;
     1691                                        var duration = ( api.previewer && 'resolved' === api.previewer.deferred.active.state() ) ? 'fast' : 0;
    16921692                                        updateNotice();
    16931693                                        if ( shouldShowNotice() ) {
    16941694                                                noticeContainer.slideDown( duration );
  • 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..57558f4942 100644
    wp.customize.settingConstructor.abbreviation = wp.customize.Setting.extend({ 
    66        }
    77});
    88
    9 jQuery( window ).load( function (){
     9jQuery( document ).ready( 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..04b5126918 100644
     
    11/* global wp */
    2 jQuery( window ).load( function (){
     2jQuery( document ).ready( function (){
    33
    44        var api = wp.customize,
    55                primaryMenuId = 3,
  • 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..416b7b9234 100644
     
    11/* global wp */
    2 jQuery( window ).load( function() {
     2jQuery( document ).ready( function() {
    33
    44        var api = wp.customize, $ = jQuery;
    55