Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / js / extlib / jquery.js

diff --git a/js/extlib/jquery.js b/js/extlib/jquery.js
index 79d631ff4639efcbf886547a40ec02143244e55c..eed17778c688271208406367c0c1681d81feca6f 100644 (file)
--- a/js/extlib/jquery.js
+++ b/js/extlib/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v2.1.3
+ * jQuery JavaScript Library v2.1.4
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2014-12-18T15:11Z
+ * Date: 2015-04-28T16:01Z
  */
 
 (function( global, factory ) {
@@ -67,7 +67,7 @@ var
        // Use the correct document accordingly with window argument (sandbox)
        document = window.document,
 
-       version = "2.1.3",
+       version = "2.1.4",
 
        // Define a local copy of jQuery
        jQuery = function( selector, context ) {
@@ -531,7 +531,12 @@ jQuery.each("Boolean Number String Function Array Date RegExp Object Error".spli
 });
 
 function isArraylike( obj ) {
-       var length = obj.length,
+
+       // Support: iOS 8.2 (not reproducible in simulator)
+       // `in` check used to prevent JIT error (gh-2145)
+       // hasOwn isn't used here due to false negatives
+       // regarding Nodelist length in IE
+       var length = "length" in obj && obj.length,
                type = jQuery.type( obj );
 
        if ( type === "function" || jQuery.isWindow( obj ) ) {