uploader.js.coffee in scrivito_resourcebrowser-0.0.4

- old
+ new

@@ -26,23 +26,18 @@
       return objClass if mimeType.match(mime)
 
     undefined
 
   _processQueue: (queue, createdObjs, promise) ->
-    promise.then (data) =>
-      @onUploadSuccess(data)
-
     file = queue.pop()
 
     if file?
-      @_createResource(file).then (obj) =>
-        @_updateProgress(file, '100%')
-        createdObjs.push(obj)
-      .always =>
-        @_processQueue(queue, createdObjs, promise)
-
-      return promise
+      @_createResource(file)
+        .done (obj) =>
+          @_updateProgress(file, '100%')
+          createdObjs.push(obj)
+          @_processQueue(queue, createdObjs, promise)
     else
       return promise.resolve(createdObjs)
 
   _addProgressWrapper: () ->
     itemsElement = $('.editing-resourcebrowser-items').empty()
@@ -91,9 +86,11 @@
 
     @onUploadStart(queue)
     @_addProgressWrapper()
 
     promise = $.Deferred()
+      .done (data) =>
+        @onUploadSuccess(data)
 
     queue = for file in files
       @_addProgress(file)
       file
 