WordPress.org

Make WordPress Core

Changeset 45354


Ignore:
Timestamp:
05/17/2019 05:07:41 PM (6 months ago)
Author:
desrosj
Message:

jQuery: bring jquery.js back into the WordPress SVN repo and backport the patch from 3.4.0.

Merges [45342] to the 5.2 branch.

Props MikeNGarrett, peterwilsoncc, azaozz.
Fixes #47020.

Location:
branches/5.2
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/5.2

  • branches/5.2/Gruntfile.js

    r45060 r45354  
    173173                        [ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.min.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.min.js' ],
    174174                        [ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ],
    175                         [ WORKING_DIR + 'wp-includes/js/jquery/jquery.js' ]: [ './node_modules/jquery/dist/jquery.min.js' ],
    176175                        [ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ],
    177176                        [ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/2/twemoji.js' ],
  • branches/5.2/package-lock.json

    r45320 r45354  
    90259025        },
    90269026        "jquery": {
    9027             "version": "1.12.4",
    9028             "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz",
    9029             "integrity": "sha1-AeHfuikP5z3rp3zurLD5ui/sngw="
     9027            "version": "3.4.1",
     9028            "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
     9029            "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
    90309030        },
    90319031        "jquery-color": {
  • branches/5.2/package.json

    r45320 r45354  
    9999        "formdata-polyfill": "3.0.13",
    100100        "imagesloaded": "3.2.0",
    101         "jquery": "1.12.4",
    102101        "jquery-color": "github:jquery/jquery-color#2.1.1",
    103102        "jquery-form": "4.2.1",
  • branches/5.2/src/wp-includes/script-loader.php

    r45320 r45354  
    10131013
    10141014    // jQuery
    1015     $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4' );
    1016     $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4' );
     1015    $scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4-wp' );
     1016    $scripts->add( 'jquery-core', '/wp-includes/js/jquery/jquery.js', array(), '1.12.4-wp' );
    10171017    $scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );
    10181018
Note: See TracChangeset for help on using the changeset viewer.