Skip to content
Permalink
Browse files

jQuery: bring jquery.js back into the WordPress SVN repo and backport…

… the patch from 3.4.0.

Merges [45342] to the 5.1 branch.

Props MikeNGarrett, peterwilsoncc, azaozz.
Fixes #47020.

git-svn-id: https://develop.svn.wordpress.org/branches/5.1@46014 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information...
azaozz committed Sep 4, 2019
1 parent 19a8957 commit 9c76dcbbe15e6261892711c60cf32aa27abb8bfd
Showing with 8 additions and 5 deletions.
  1. +0 −1 Gruntfile.js
  2. +3 −3 package-lock.json
  3. +0 −1 package.json
  4. +5 −0 src/js/_enqueues/vendor/jquery/jquery.js
@@ -171,7 +171,6 @@ module.exports = function(grunt) {
[ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.js' ],
[ WORKING_DIR + 'wp-includes/js/jquery/jquery-migrate.min.js' ]: [ './node_modules/jquery-migrate/dist/jquery-migrate.min.js' ],
[ WORKING_DIR + 'wp-includes/js/jquery/jquery.form.js' ]: [ './node_modules/jquery-form/src/jquery.form.js' ],
[ WORKING_DIR + 'wp-includes/js/jquery/jquery.js' ]: [ './node_modules/jquery/dist/jquery.min.js' ],
[ WORKING_DIR + 'wp-includes/js/masonry.min.js' ]: [ './node_modules/masonry-layout/dist/masonry.pkgd.min.js' ],
[ WORKING_DIR + 'wp-includes/js/twemoji.js' ]: [ './node_modules/twemoji/2/twemoji.js' ],
[ WORKING_DIR + 'wp-includes/js/underscore.js' ]: [ './node_modules/underscore/underscore.js' ],

Some generated files are not rendered by default. Learn more.

@@ -95,7 +95,6 @@
"element-closest": "^2.0.2",
"formdata-polyfill": "3.0.13",
"imagesloaded": "3.2.0",
"jquery": "1.12.4",
"jquery-color": "github:jquery/jquery-color#2.1.1",
"jquery-form": "4.2.1",
"jquery-hoverintent": "1.8.3",

Large diffs are not rendered by default.

0 comments on commit 9c76dcb

Please sign in to comment.
You can’t perform that action at this time.