Merge branch 'MDL-51535-master' of git://github.com/junpataleta/moodle

Mrmoodle · Oct 6, 2015 · a5bde1f · a5bde1f
2 parents 6b58b26 + d463b9c
commit a5bde1f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/lib/jquery/jquery-1.11.2.min.js b/lib/jquery/jquery-1.11.2.min.js
diff --git a/lib/jquery/jquery-1.11.2.js → lib/jquery/jquery-1.11.3.js b/lib/jquery/jquery-1.11.2.js → lib/jquery/jquery-1.11.3.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.11.2
+ * jQuery JavaScript Library v1.11.3
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2014-12-17T15:27Z
+ * Date: 2015-04-28T16:19Z
  */
 
 (function( global, factory ) {
@@ -64,7 +64,7 @@ var support = {};
 
 
 var
-	version = "1.11.2",
+	version = "1.11.3",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -569,7 +569,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 ) ) {

diff --git a/lib/jquery/jquery-1.11.3.min.js b/lib/jquery/jquery-1.11.3.min.js
diff --git a/lib/jquery/plugins.php b/lib/jquery/plugins.php
@@ -37,7 +37,7 @@
  */
 
 $plugins = array(
-    'jquery'  => array('files' => array('jquery-1.11.2.min.js')),
+    'jquery'  => array('files' => array('jquery-1.11.3.min.js')),
     'migrate' => array('files' => array('jquery-migrate-1.2.1.min.js')),
     'ui'      => array('files' => array('ui-1.11.4/jquery-ui.min.js')),
     'ui-css'  => array('files' => array('ui-1.11.4/theme/smoothness/jquery-ui.min.css')),

diff --git a/lib/requirejs/moodle-config.js b/lib/requirejs/moodle-config.js
@@ -5,7 +5,7 @@ var require = {
     skipDataMain: true,
 
     paths: {
-        jquery: '[JSURL]lib/jquery/jquery-1.11.2.min[JSEXT]',
+        jquery: '[JSURL]lib/jquery/jquery-1.11.3.min[JSEXT]',
         jqueryui: '[JSURL]lib/jquery/ui-1.11.4/jquery-ui.min[JSEXT]',
         jqueryprivate: '[JSURL]lib/requirejs/jquery-private[JSEXT]'
     },

diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
@@ -179,7 +179,7 @@
     <location>jquery</location>
     <name>jQuery</name>
     <license>MIT</license>
-    <version>1.11.2</version>
+    <version>1.11.3</version>
     <licenseversion></licenseversion>
   </library>
   <library>