8000 minor #66 Update jQuery to v2.1.4 (tronsha, javiereguiluz) · SofHad/symfony@c33ea28 · GitHub
[go: up one dir, main page]
Skip to content

Commit c33ea28

Browse files
javiereguiluzjaviereguiluz
committed
minor symfony#66 Update jQuery to v2.1.4 (tronsha, javiereguiluz)
This PR was merged into the master branch. Discussion ---------- Update jQuery to v2.1.4 This finishes symfony#65 by adding the source files of jQuery and by updating the link of the application layout. Commits ------- 4b48e82 Added the jQuery source files and fixed the layout links b029e2a Update jQuery to v2.1.4
2 parents d3d7abb + 4b48e82 commit c33ea28

File tree

5 files changed

+18
-13
lines changed

5 files changed

+18
-13
lines changed

‎app/Resources/assets/js/jquery-2.1.3.min.js‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎app/Resources/assets/js/jquery-2.1.3.js‎ renamed to ‎app/Resources/assets/js/jquery-2.1.4.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery JavaScript Library v2.1.3
2+
* jQuery JavaScript Library v2.1.4
33
* http://jquery.com/
44
*
55
* Includes Sizzle.js
@@ -9,7 +9,7 @@
99
* Released under the MIT license
1010
* http://jquery.org/license
1111
*
12-
* Date: 2014-12-18T15:11Z
12+
* Date: 2015-04-28T16:01Z
1313
*/
1414

1515
(function( global, factory ) {
@@ -67,7 +67,7 @@ var
6767
// Use the correct document accordingly with window argument (sandbox)
6868
document = window.document,
6969

70-
version = "2.1.3",
70+
version = "2.1.4",
7171

7272
// Define a local copy of jQuery
7373
jQuery = function( selector, context ) {
@@ -531,7 +531,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
531531
});
532532

533533
function isArraylike( obj ) {
534-
var length = obj.length,
534+
535+
// Support: iOS 8.2 (not reproducible in simulator)
536+
// `in` check used to prevent JIT error (gh-2145)
537+
// hasOwn isn't used here due to false negatives
538+
// regarding Nodelist length in IE
539+
var length = "length" in obj && obj.length,
535540
type = jQuery.type( obj );
536541

537542
if ( type === "function" || jQuery.isWindow( obj ) ) {

‎app/Resources/assets/js/jquery-2.1.4.min.js‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/Resources/views/base.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
{% block javascripts %}
136136
{# uncomment the following lines to compile JavaScript assets with Assetic
137137
{% javascripts output="js/app.js"
138-
"%kernel.root_dir%/Resources/assets/js/jquery-2.1.3.min.js"
138+
"%kernel.root_dir%/Resources/assets/js/jquery-2.1.4.min.js"
139139
"%kernel.root_dir%/Resources/assets/js/bootstrap-3.3.4.min.js"
140140
"%kernel.root_dir%/Resources/assets/js/highlight.pack.js" %}
141141
<script src="{{ asset_url }}"></script>

‎web/js/app.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0