summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshadlaws <shad@shadlaws.com>2013-02-26 12:19:51 +0100
committershadlaws <shad@shadlaws.com>2013-02-26 12:19:51 +0100
commit3f2d005e5fb51eecfd86c39e6d09193198902f7f (patch)
tree7c71eb7c60ef781be640f5373e4b7cabd32dc932
parent1d2610d613576f9bce7b21bc12852da4bd77ae46 (diff)
Update jQuery libraries to current as of 2013/02/26, in sync with gallery3-vendor.
- updated jquery.cookie.js - updated jquery.form.js
-rw-r--r--lib/jquery.cookie.js2
-rw-r--r--lib/jquery.form.js6
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;
};