issue #44, #52 media_upload reused, error handling

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index cbe7304c2..fd2104e8e 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -107,7 +107,8 @@ qq.FileUploaderExtended = function(o){
             // added to list item when upload completes
             // used in css to hide progress spinner
             success: 'qq-upload-success',
-            fail: 'qq-upload-fail'
+            fail: 'qq-upload-fail',
+            failedText : 'qq-upload-failed-text'
         }
     });
 
@@ -143,7 +144,7 @@ qq.extend(qq.FileUploaderExtended.prototype, {
     },
 
     _onComplete: function(id, fileName, result){
-        qq.FileUploaderBasic.prototype._onComplete.apply(this, arguments);
+        this._filesInProgress--;
 
         // mark completed
         var item = this._getItemByFileId(id);
@@ -159,6 +160,8 @@ qq.extend(qq.FileUploaderExtended.prototype, {
             qq.addClass(item, this._classes.success);
         } else {
             qq.addClass(item, this._classes.fail);
+            var fail = this._find(item, 'failedText');
+            qq.setText(fail, result.error);
         }
     }
 
@@ -207,7 +210,7 @@ qq.extend(qq.UploadHandlerForm.prototype, {
         var form = this._createForm(iframe, params);
         form.appendChild(input);
 
-        var nameInput = qq.toElement('<input name="file_name" value="' + fileName + '" type="text">');
+        var nameInput = qq.toElement('<input name="mediaid" value="' + fileName + '" type="text">');
         form.appendChild(nameInput);
 
         var owCheckbox = document.getElementById('dw__ow').cloneNode(true);