Explicit attachMulti() on CouchDoc

bkeil · Dec 1, 2013 · b8167e8 · b8167e8
1 parent e7adc16
commit b8167e8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/angular-cornercouch.js b/angular-cornercouch.js
@@ -85,24 +85,34 @@ factory('cornercouch', ['$http', function($http) {
         };
 
         // Requires File-API 'file', sorry IE9
-        CouchDoc.prototype.attach = function(file, nameOrCallback) {
+        CouchDoc.prototype.attach = function(file, name, reloadCB) {
 
-            var isF = ng.isFunction(nameOrCallback);            
             var doc = this;
+            if (ng.isFunction(name)) { reloadCB = name; name = null; }
 
             return $http({
                 method:     "PUT",
-                url:        encodeUri(dbUri, doc._id, !isF && nameOrCallback || file.name),
+                url:        encodeUri(dbUri, doc._id, name || file.name),
                 params:     { rev: doc._rev },
                 headers:    { "Content-Type": file.type },
                 data:       file
             })
             .success(function () {
                 // Reload document for local consistency
-                doc.load().success(isF ? nameOrCallback : ng.noop);
+                doc.load().success(reloadCB || ng.noop);
             });
         };
-
+
+        CouchDoc.prototype.attachMulti = function(files, successCB) {
+            var doc = this;
+            var idx = 0;
+            function loopCB() {
+                if (idx < files.length)
+                    doc.attach(files[idx], ++idx < files.length ? loopCB : successCB);
+            };
+            loopCB();
+        }
+
         CouchDoc.prototype.detach = function(name) {
 
             var doc = this;

diff --git a/guestbook.html b/guestbook.html
@@ -140,17 +140,10 @@ <h4>{{detail.alias}} wrote at {{detail.utc}} UTC</h4>
     };
 
     $scope.attachClick = function() {
-
         var fileInput = document.getElementById("upload");
-        var idx = 0;
-
-        function callback() {
-            if (idx < fileInput.files.length)
-                $scope.detail.attach(fileInput.files[idx++], callback).error(setError);
-            else
-                fileInput.value = "";
-        };
-        callback();
+        $scope.detail.attachMulti(fileInput.files, function () {
+            fileInput.value = "";
+        });
     };
 
     $scope.detachClick = function(name) {