Restored the original behaviour of onCompleted() and onCompletedAll()

Restored the original behaviour of onCompleted() and onCompletedAll(); added new onUploadSuccess() callback

FIX #25, #26

Author: BrandonNoad

README.md

@@ -65,12 +65,18 @@ $uiUploader.startUpload({
                     // file contains a File object
                     console.log(file);
                 },
-                onCompleted: function(file, response) {
+                onUploadSuccess: function(file) {
                     // file contains a File object
                     console.log(file);
-                    // response contains the server response
-                    console.log(response);
-                }
+                },
+                onCompleted: function(file, responseText, status) {
+                    // file contains a File object
+                    console.log(file);
+                    // responseText contains the server response as text
+                    console.log(responseText);
+                    // status contains the status of the response
+                    console.log(status);
+                },
                 onCompletedAll: function(files) {
                 	// files is an array of File objects
                 	console.log(files);
@@ -87,11 +93,14 @@ $uiUploader.startUpload({
                 	withCredentials: true
                 },
                 onProgress: function(file) {
-                    //do stuff
+                    // do stuff
                 },
-                onCompleted: function(file, response) {
+                onUploadSuccess: function(file) {
                     // do stuff
-                }
+                },
+                onCompleted: function(file, responseText, status) {
+                    // do stuff
+                },
                 onCompletedAll: function(files) {
                 	// do stuff
                 }

src/uploader.js

@@ -112,14 +112,34 @@ function uiUploader($log) {
             }
         };
 
-        // Triggered when upload is completed:
+        // Triggered when the upload is successful (the server may not have responded yet).
         xhr.upload.onload = function() {
+
+            if (angular.isFunction(self.options.onUploadSuccess)) {
+                self.options.onUploadSuccess(file);
+            }
+        };
+
+        // Triggered when upload fails:
+        xhr.upload.onerror = function(e) {
+            if (angular.isFunction(self.options.onError)) {
+                self.options.onError(e);
+            }
+        };
+
+        // Triggered when the upload has completed AND the server has responded. Equivalent to
+        // listening for the readystatechange event when xhr.readyState === XMLHttpRequest.DONE.
+        xhr.onload = function () {
+
             self.activeUploads -= 1;
             self.uploadedFiles += 1;
+
             startUpload(self.options);
+
             if (angular.isFunction(self.options.onCompleted)) {
                 self.options.onCompleted(file, xhr.responseText, xhr.status);
-            }            
+            }
+
             if (self.activeUploads === 0) {
                 self.uploadedFiles = 0;
                 if (angular.isFunction(self.options.onCompletedAll)) {
@@ -128,13 +148,6 @@ function uiUploader($log) {
             }
         };
 
-        // Triggered when upload fails:
-        xhr.upload.onerror = function(e) {
-            if (angular.isFunction(self.options.onError)) {
-                self.options.onError(e);
-            }
-        };
-
         // Append additional data if provided:
         if (data) {
             for (prop in data) {