Merge branch 'doochik-patch-1'

Author: malsup

jquery.form.js

@@ -232,27 +232,30 @@ $.fn.ajaxSubmit = function(options) {
             cache: false,
             type: 'POST'
         });
-
+        
         if (options.uploadProgress) {
             // workaround because jqXHR does not expose upload property
             s.xhr = function() {
                 var xhr = jQuery.ajaxSettings.xhr();
                 if (xhr.upload) {
                     xhr.upload.onprogress = function(event) {
                         var percent = 0;
-                        if (event.lengthComputable)
-                            percent = parseInt((event.position / event.total) * 100, 10);
-                        options.uploadProgress(event, event.position, event.total, percent);
-                    };
+                        var position = event.loaded || event.position; /*event.position is deprecated*/
+                        var total = event.total;
+                        if (event.lengthComputable) {
+                            percent = Math.ceil(position / total * 100);
+                        }
+                        options.uploadProgress(event, position, total, percent);
+                    }
                 }
                 return xhr;
-            };
+            }
         }
 
-        s.data = null;
-        var beforeSend = s.beforeSend;
-        s.beforeSend = function(xhr, o) {
-            o.data = formdata;
+      	s.data = null;
+      	var beforeSend = s.beforeSend;
+      	s.beforeSend = function(xhr, o) {
+          	o.data = formdata;
             if(beforeSend)
                 beforeSend.call(o, xhr, options);
         };