Skip to content

Commit 180c5c3

Browse files
committed
Release 3.4.0
1 parent 9e8ec3d commit 180c5c3

37 files changed

+1309
-622
lines changed

AUTHORS.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,3 +311,11 @@ Henry Zhu <hi@henryzoo.com>
311311
Saptak Sengupta <saptak013@gmail.com>
312312
Nilton Cesar <niltoncms@gmail.com>
313313
basil.belokon <basil.belokon@gmail.com>
314+
tmybr11 <tomas.perone@gmail.com>
315+
Luis Emilio Velasco Sanchez <emibloque@gmail.com>
316+
Ed S <ejsanders@gmail.com>
317+
Bert Zhang <enbo@users.noreply.github.com>
318+
Andrei Fangli <andrei_fangli@outlook.com>
319+
Marja Hölttä <marja.holtta@gmail.com>
320+
abnud1 <ahmad13932013@hotmail.com>
321+
buddh4 <mail@jharrer.de>

LICENSE.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
Copyright JS Foundation and other contributors, https://js.foundation/
22

3-
This software consists of voluntary contributions made by many
4-
individuals. For exact contribution history, see the revision history
5-
available at https://github.com/jquery/jquery
6-
7-
The following license applies to all parts of this software except as
8-
documented below:
9-
10-
====
11-
123
Permission is hereby granted, free of charge, to any person obtaining
134
a copy of this software and associated documentation files (the
145
"Software"), to deal in the Software without restriction, including
@@ -27,10 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
2718
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2819
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2920
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30-
31-
====
32-
33-
All files located in the node_modules and external directories are
34-
externally maintained libraries used by this software which have their
35-
own licenses; we recommend you read them, as their terms may differ from
36-
the terms above.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
For information on how to get started and how to use jQuery, please see [jQuery's documentation](http://api.jquery.com/).
66
For source files and issues, please visit the [jQuery repo](https://github.com/jquery/jquery).
77

8-
If upgrading, please see the [blog post for 3.3.1](https://blog.jquery.com/2017/03/20/jquery-3.3.1-now-available/). This includes notable differences from the previous version and a more readable changelog.
8+
If upgrading, please see the [blog post for 3.4.0](https://blog.jquery.com/2019/04/10/jquery-3-4-0-released/). This includes notable differences from the previous version and a more readable changelog.
99

1010
## Including jQuery
1111

@@ -16,7 +16,7 @@ Below are some of the most common ways to include jQuery.
1616
#### Script tag
1717

1818
```html
19-
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
19+
<script src="https://code.jquery.com/jquery-3.4.0.min.js"></script>
2020
```
2121

2222
#### Babel

dist/core.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ define( [
2727
"use strict";
2828

2929
var
30-
version = "3.3.1",
30+
version = "3.4.0",
3131

3232
// Define a local copy of jQuery
3333
jQuery = function( selector, context ) {
@@ -156,25 +156,28 @@ jQuery.extend = jQuery.fn.extend = function() {
156156

157157
// Extend the base object
158158
for ( name in options ) {
159-
src = target[ name ];
160159
copy = options[ name ];
161160

161+
// Prevent Object.prototype pollution
162162
// Prevent never-ending loop
163-
if ( target === copy ) {
163+
if ( name === "__proto__" || target === copy ) {
164164
continue;
165165
}
166166

167167
// Recurse if we're merging plain objects or arrays
168168
if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
169169
( copyIsArray = Array.isArray( copy ) ) ) ) {
170+
src = target[ name ];
170171

171-
if ( copyIsArray ) {
172-
copyIsArray = false;
173-
clone = src && Array.isArray( src ) ? src : [];
174-
172+
// Ensure proper type for the source value
173+
if ( copyIsArray && !Array.isArray( src ) ) {
174+
clone = [];
175+
} else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) {
176+
clone = {};
175177
} else {
176-
clone = src && jQuery.isPlainObject( src ) ? src : {};
178+
clone = src;
177179
}
180+
copyIsArray = false;
178181

179182
// Never move original objects, clone them
180183
target[ name ] = jQuery.extend( deep, clone, copy );
@@ -227,9 +230,6 @@ jQuery.extend( {
227230
},
228231

229232
isEmptyObject: function( obj ) {
230-
231-
/* eslint-disable no-unused-vars */
232-
// See https://github.com/eslint/eslint/issues/6125
233233
var name;
234234

235235
for ( name in obj ) {
@@ -239,8 +239,8 @@ jQuery.extend( {
239239
},
240240

241241
// Evaluates a script in a global context
242-
globalEval: function( code ) {
243-
DOMEval( code );
242+
globalEval: function( code, options ) {
243+
DOMEval( code, { nonce: options && options.nonce } );
244244
},
245245

246246
each: function( obj, callback ) {

0 commit comments

Comments
 (0)