Skip to content

Commit fa0ee87

Browse files
committed
Upgrade jQuery to 3.4.1
1 parent 6c20aaf commit fa0ee87

File tree

6 files changed

+40
-25
lines changed

6 files changed

+40
-25
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 4.3.5
2+
3+
- update jquery to 3.4.1
4+
15
## 4.3.4
26

37
- update jquery to 3.4.0

VERSIONS.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
| Gem | jQuery | jQuery UJS | jQuery UI |
44
|--------|--------|------------| ----------|
5+
| 4.3.5 | 1.12.4 & 2.2.4 & 3.4.1 | 1.2.2 | - |
56
| 4.3.4 | 1.12.4 & 2.2.4 & 3.4.0 | 1.2.2 | - |
67
| 4.3.3 | 1.12.4 & 2.2.4 & 3.3.1 | 1.2.2 | - |
78
| 4.3.2 | 1.12.4 & 2.2.4 & 3.3.0 | 1.2.2 | - |

lib/jquery/rails/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module Rails
33
VERSION = "4.3.4"
44
JQUERY_VERSION = "1.12.4"
55
JQUERY_2_VERSION = "2.2.4"
6-
JQUERY_3_VERSION = "3.4.0"
6+
JQUERY_3_VERSION = "3.4.1"
77
JQUERY_UJS_VERSION = "1.2.2"
88
end
99
end

vendor/assets/javascripts/jquery3.js

+31-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery JavaScript Library v3.4.0
2+
* jQuery JavaScript Library v3.4.1
33
* https://jquery.com/
44
*
55
* Includes Sizzle.js
@@ -9,7 +9,7 @@
99
* Released under the MIT license
1010
* https://jquery.org/license
1111
*
12-
* Date: 2019-04-10T19:48Z
12+
* Date: 2019-05-01T21:04Z
1313
*/
1414
( function( global, factory ) {
1515

@@ -142,7 +142,7 @@ function toType( obj ) {
142142

143143

144144
var
145-
version = "3.4.0",
145+
version = "3.4.1",
146146

147147
// Define a local copy of jQuery
148148
jQuery = function( selector, context ) {
@@ -4498,8 +4498,12 @@ var documentElement = document.documentElement;
44984498
},
44994499
composed = { composed: true };
45004500

4501+
// Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only
45014502
// Check attachment across shadow DOM boundaries when possible (gh-3504)
4502-
if ( documentElement.attachShadow ) {
4503+
// Support: iOS 10.0-10.2 only
4504+
// Early iOS 10 versions support `attachShadow` but not `getRootNode`,
4505+
// leading to errors. We need to check for `getRootNode`.
4506+
if ( documentElement.getRootNode ) {
45034507
isAttached = function( elem ) {
45044508
return jQuery.contains( elem.ownerDocument, elem ) ||
45054509
elem.getRootNode( composed ) === elem.ownerDocument;
@@ -5359,8 +5363,7 @@ jQuery.event = {
53595363

53605364
// Claim the first handler
53615365
if ( rcheckableType.test( el.type ) &&
5362-
el.click && nodeName( el, "input" ) &&
5363-
dataPriv.get( el, "click" ) === undefined ) {
5366+
el.click && nodeName( el, "input" ) ) {
53645367

53655368
// dataPriv.set( el, "click", ... )
53665369
leverageNative( el, "click", returnTrue );
@@ -5377,8 +5380,7 @@ jQuery.event = {
53775380

53785381
// Force setup before triggering a click
53795382
if ( rcheckableType.test( el.type ) &&
5380-
el.click && nodeName( el, "input" ) &&
5381-
dataPriv.get( el, "click" ) === undefined ) {
5383+
el.click && nodeName( el, "input" ) ) {
53825384

53835385
leverageNative( el, "click" );
53845386
}
@@ -5419,7 +5421,9 @@ function leverageNative( el, type, expectSync ) {
54195421

54205422
// Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add
54215423
if ( !expectSync ) {
5422-
jQuery.event.add( el, type, returnTrue );
5424+
if ( dataPriv.get( el, type ) === undefined ) {
5425+
jQuery.event.add( el, type, returnTrue );
5426+
}
54235427
return;
54245428
}
54255429

@@ -5434,9 +5438,13 @@ function leverageNative( el, type, expectSync ) {
54345438
if ( ( event.isTrigger & 1 ) && this[ type ] ) {
54355439

54365440
// Interrupt processing of the outer synthetic .trigger()ed event
5437-
if ( !saved ) {
5441+
// Saved data should be false in such cases, but might be a leftover capture object
5442+
// from an async native handler (gh-4350)
5443+
if ( !saved.length ) {
54385444

54395445
// Store arguments for use when handling the inner native event
5446+
// There will always be at least one argument (an event object), so this array
5447+
// will not be confused with a leftover capture object.
54405448
saved = slice.call( arguments );
54415449
dataPriv.set( this, type, saved );
54425450

@@ -5449,14 +5457,14 @@ function leverageNative( el, type, expectSync ) {
54495457
if ( saved !== result || notAsync ) {
54505458
dataPriv.set( this, type, false );
54515459
} else {
5452-
result = undefined;
5460+
result = {};
54535461
}
54545462
if ( saved !== result ) {
54555463

54565464
// Cancel the outer synthetic event
54575465
event.stopImmediatePropagation();
54585466
event.preventDefault();
5459-
return result;
5467+
return result.value;
54605468
}
54615469

54625470
// If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5471,17 +5479,19 @@ function leverageNative( el, type, expectSync ) {
54715479

54725480
// If this is a native event triggered above, everything is now in order
54735481
// Fire an inner synthetic event with the original arguments
5474-
} else if ( saved ) {
5482+
} else if ( saved.length ) {
54755483

54765484
// ...and capture the result
5477-
dataPriv.set( this, type, jQuery.event.trigger(
5478-
5479-
// Support: IE <=9 - 11+
5480-
// Extend with the prototype to reset the above stopImmediatePropagation()
5481-
jQuery.extend( saved.shift(), jQuery.Event.prototype ),
5482-
saved,
5483-
this
5484-
) );
5485+
dataPriv.set( this, type, {
5486+
value: jQuery.event.trigger(
5487+
5488+
// Support: IE <=9 - 11+
5489+
// Extend with the prototype to reset the above stopImmediatePropagation()
5490+
jQuery.extend( saved[ 0 ], jQuery.Event.prototype ),
5491+
saved.slice( 1 ),
5492+
this
5493+
)
5494+
} );
54855495

54865496
// Abort handling of the native event
54875497
event.stopImmediatePropagation();

vendor/assets/javascripts/jquery3.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/jquery3.min.map

+1-1
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)