From b852050507bd763c02367aea90389f692dacadc1 Mon Sep 17 00:00:00 2001
From: Ray Nicholus <rnicholus@widen.com>
Date: Thu, 2 Oct 2014 22:37:17 -0500
Subject: [PATCH] chore(merge): sync with develop branch #1198

---
 client/js/uploader.basic.api.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/js/uploader.basic.api.js b/client/js/uploader.basic.api.js
index 102e66f8e..2fa8c0795 100644
--- 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