From 4c444592d6ad6d20adc17c199e284759c3f72695 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 2 May 2019 12:18:32 +0200 Subject: [PATCH] DEV: jquery 3.4.1 (#7470) --- package.json | 2 +- vendor/assets/javascripts/jquery.js | 50 +++++++++++++++++------------ yarn.lock | 8 ++--- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 1d72bc5aac4..f409d9450d4 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "highlight.js": "https://github.com/highlightjs/highlight.js", "htmlparser": "https://github.com/tautologistics/node-htmlparser", "intersection-observer": "^0.5.1", - "jquery": "3.4.0", + "jquery": "3.4.1", "jquery-color": "1.0.0", "jquery-resize": "https://github.com/cowboy/jquery-resize/", "jquery-tags-input": "1.3.5", diff --git a/vendor/assets/javascripts/jquery.js b/vendor/assets/javascripts/jquery.js index be2e6af5448..773ad95c56f 100644 --- a/vendor/assets/javascripts/jquery.js +++ b/vendor/assets/javascripts/jquery.js @@ -1,5 +1,5 @@ /*! - * jQuery JavaScript Library v3.4.0 + * jQuery JavaScript Library v3.4.1 * https://jquery.com/ * * Includes Sizzle.js @@ -9,7 +9,7 @@ * Released under the MIT license * https://jquery.org/license * - * Date: 2019-04-10T19:48Z + * Date: 2019-05-01T21:04Z */ ( function( global, factory ) { @@ -142,7 +142,7 @@ function toType( obj ) { var - version = "3.4.0", + version = "3.4.1", // Define a local copy of jQuery jQuery = function( selector, context ) { @@ -4498,8 +4498,12 @@ var documentElement = document.documentElement; }, composed = { composed: true }; + // Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only // Check attachment across shadow DOM boundaries when possible (gh-3504) - if ( documentElement.attachShadow ) { + // Support: iOS 10.0-10.2 only + // Early iOS 10 versions support `attachShadow` but not `getRootNode`, + // leading to errors. We need to check for `getRootNode`. + if ( documentElement.getRootNode ) { isAttached = function( elem ) { return jQuery.contains( elem.ownerDocument, elem ) || elem.getRootNode( composed ) === elem.ownerDocument; @@ -5359,8 +5363,7 @@ jQuery.event = { // Claim the first handler if ( rcheckableType.test( el.type ) && - el.click && nodeName( el, "input" ) && - dataPriv.get( el, "click" ) === undefined ) { + el.click && nodeName( el, "input" ) ) { // dataPriv.set( el, "click", ... ) leverageNative( el, "click", returnTrue ); @@ -5377,8 +5380,7 @@ jQuery.event = { // Force setup before triggering a click if ( rcheckableType.test( el.type ) && - el.click && nodeName( el, "input" ) && - dataPriv.get( el, "click" ) === undefined ) { + el.click && nodeName( el, "input" ) ) { leverageNative( el, "click" ); } @@ -5419,7 +5421,9 @@ function leverageNative( el, type, expectSync ) { // Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add if ( !expectSync ) { - jQuery.event.add( el, type, returnTrue ); + if ( dataPriv.get( el, type ) === undefined ) { + jQuery.event.add( el, type, returnTrue ); + } return; } @@ -5434,9 +5438,13 @@ function leverageNative( el, type, expectSync ) { if ( ( event.isTrigger & 1 ) && this[ type ] ) { // Interrupt processing of the outer synthetic .trigger()ed event - if ( !saved ) { + // Saved data should be false in such cases, but might be a leftover capture object + // from an async native handler (gh-4350) + if ( !saved.length ) { // Store arguments for use when handling the inner native event + // There will always be at least one argument (an event object), so this array + // will not be confused with a leftover capture object. saved = slice.call( arguments ); dataPriv.set( this, type, saved ); @@ -5449,14 +5457,14 @@ function leverageNative( el, type, expectSync ) { if ( saved !== result || notAsync ) { dataPriv.set( this, type, false ); } else { - result = undefined; + result = {}; } if ( saved !== result ) { // Cancel the outer synthetic event event.stopImmediatePropagation(); event.preventDefault(); - return result; + return result.value; } // If this is an inner synthetic event for an event with a bubbling surrogate @@ -5471,17 +5479,19 @@ function leverageNative( el, type, expectSync ) { // If this is a native event triggered above, everything is now in order // Fire an inner synthetic event with the original arguments - } else if ( saved ) { + } else if ( saved.length ) { // ...and capture the result - dataPriv.set( this, type, jQuery.event.trigger( + dataPriv.set( this, type, { + value: jQuery.event.trigger( - // Support: IE <=9 - 11+ - // Extend with the prototype to reset the above stopImmediatePropagation() - jQuery.extend( saved.shift(), jQuery.Event.prototype ), - saved, - this - ) ); + // Support: IE <=9 - 11+ + // Extend with the prototype to reset the above stopImmediatePropagation() + jQuery.extend( saved[ 0 ], jQuery.Event.prototype ), + saved.slice( 1 ), + this + ) + } ); // Abort handling of the native event event.stopImmediatePropagation(); diff --git a/yarn.lock b/yarn.lock index a32da8cf906..4fb8d8dfdef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1364,10 +1364,10 @@ jquery.cookie@1.4.1: resolved "https://registry.yarnpkg.com/jquery.cookie/-/jquery.cookie-1.4.1.tgz#d63dce209eab691fe63316db08ca9e47e0f9385b" integrity sha1-1j3OIJ6raR/mMxbbCMqeR+D5OFs= -jquery@3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.0.tgz#8de513fa0fa4b2c7d2e48a530e26f0596936efdf" - integrity sha512-ggRCXln9zEqv6OqAGXFEcshF5dSBvCkzj6Gm2gzuR5fWawaX8t7cxKVkkygKODrDAzKdoYw3l/e3pm3vlT4IbQ== +jquery@3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" + integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== js-reporters@1.2.1: version "1.2.1"