chore(merge): sync with develop branch

#1198
FineUploader · Oct 3, 2014 · b852050 · b852050
1 parent 3570500
commit b852050
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/client/js/uploader.basic.api.js b/client/js/uploader.basic.api.js
@@ -47,12 +47,12 @@
             }
         },
 
-        addFiles: function(filesOrInputs, params, endpoint) {
-            var batchId = this._storedIds.length === 0 ? qq.getUniqueId() : this._currentBatchId;
+        addFiles: function(data, params, endpoint) {
             this._maybeHandleIos8SafariWorkaround();
-            this._currentBatchId = batchId;
-
-            var processBlob = qq.bind(function(blob) {
+
+            var batchId = this._storedIds.length === 0 ? qq.getUniqueId() : this._currentBatchId,
+
+                processBlob = qq.bind(function(blob) {
                     this._handleNewFile({
                         blob: blob,
                         name: this._options.blobs.defaultName