From 4c1e5a9218388379d56e0a540343b0d6c2cefa31 Mon Sep 17 00:00:00 2001 From: Ilya Katz Date: Mon, 1 Feb 2016 10:50:44 -0800 Subject: [PATCH 1/2] add an event that indicates that all upload attempts are complete --- app/assets/javascripts/s3_direct_upload.js.coffee | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/javascripts/s3_direct_upload.js.coffee b/app/assets/javascripts/s3_direct_upload.js.coffee index eb183e1..9070acc 100644 --- a/app/assets/javascripts/s3_direct_upload.js.coffee +++ b/app/assets/javascripts/s3_direct_upload.js.coffee @@ -102,6 +102,7 @@ $.fn.S3Uploader = (options) -> current_files.splice($.inArray(data, current_files), 1) # remove that element from the array $uploadForm.trigger("s3_uploads_complete", [content]) unless current_files.length + $uploadForm.trigger("s3_uploads_done", [content]) unless current_files.length fail: (e, data) -> content = build_content_object $uploadForm, data.files[0], data.result @@ -110,6 +111,10 @@ $.fn.S3Uploader = (options) -> data.context.remove() if data.context && settings.remove_failed_progress_bar # remove progress bar $uploadForm.trigger("s3_upload_failed", [content]) + current_files.splice($.inArray(data, current_files), 1) # remove that element from the array + $uploadForm.trigger("s3_uploads_done", [content]) unless current_files.length + console.log("done fail") + formData: (form) -> data = $uploadForm.find("input").serializeArray() fileType = "" From d50ac4995af18b4a3dcbb12777cf99cc27bc34b4 Mon Sep 17 00:00:00 2001 From: Ilya Katz Date: Mon, 1 Feb 2016 10:56:34 -0800 Subject: [PATCH 2/2] remove the logger --- app/assets/javascripts/s3_direct_upload.js.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/s3_direct_upload.js.coffee b/app/assets/javascripts/s3_direct_upload.js.coffee index 9070acc..a3fc2e1 100644 --- a/app/assets/javascripts/s3_direct_upload.js.coffee +++ b/app/assets/javascripts/s3_direct_upload.js.coffee @@ -107,13 +107,13 @@ $.fn.S3Uploader = (options) -> fail: (e, data) -> content = build_content_object $uploadForm, data.files[0], data.result content.error_thrown = data.errorThrown + content.messages = data.messages data.context.remove() if data.context && settings.remove_failed_progress_bar # remove progress bar $uploadForm.trigger("s3_upload_failed", [content]) current_files.splice($.inArray(data, current_files), 1) # remove that element from the array $uploadForm.trigger("s3_uploads_done", [content]) unless current_files.length - console.log("done fail") formData: (form) -> data = $uploadForm.find("input").serializeArray()