Merge pull request #166 from shadlaws/update_jquery_20130226

Update jQuery libraries to current as of 2013/02/26, in sync with gallery3-vendor.

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/jquery.cookie.js b/lib/jquery.cookie.js
index 06d5e213..8463b44e 100644
--- a/lib/jquery.cookie.js
+++ b/lib/jquery.cookie.js
@@ -6,7 +6,7 @@
  * Released under the MIT license
  */
 (function (factory) {
-	if (typeof define === 'function' && define.amd && define.amd.jQuery) {
+	if (typeof define === 'function' && define.amd) {
 		// AMD. Register as anonymous module.
 		define(['jquery'], factory);
 	} else {
diff --git a/lib/jquery.form.js b/lib/jquery.form.js
index 64a91606..89d54306 100644
--- a/lib/jquery.form.js
+++ b/lib/jquery.form.js
@@ -1,6 +1,6 @@
 /*!
  * jQuery Form Plugin
- * version: 3.26.0-2013.01.28
+ * version: 3.27.0-2013.02.06
  * @requires jQuery v1.5 or later
  *
  * Examples and documentation at: http://malsup.com/jquery/form/
@@ -263,7 +263,7 @@ $.fn.ajaxSubmit = function(options) {
             s.xhr = function() {
                 var xhr = jQuery.ajaxSettings.xhr();
                 if (xhr.upload) {
-                    xhr.upload.onprogress = function(event) {
+                    xhr.upload.addEventListener('progress', function(event) {
                         var percent = 0;
                         var position = event.loaded || event.position; /*event.position is deprecated*/
                         var total = event.total;
@@ -271,7 +271,7 @@ $.fn.ajaxSubmit = function(options) {
                             percent = Math.ceil(position / total * 100);
                         }
                         options.uploadProgress(event, position, total, percent);
-                    };
+                    }, false);
                 }
                 return xhr;
             };