From 465bed94a2fd7616d7755ae15611331c7b510fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Fri, 20 Nov 2015 15:14:25 +0100 Subject: [PATCH] Use overallProgress bar all the time --- .../file_drag_and_drop_preview_progress.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_progress.js b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_progress.js index fb789ba5..00c62f64 100644 --- a/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_progress.js +++ b/js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop_preview_progress.js @@ -41,18 +41,8 @@ let FileDragAndDropPreviewProgress = React.createClass({ render() { const files = this.props.files.filter(displayValidProgressFilesFilter); + const style = !files.length ? { display: 'none' } : null; let overallProgress = this.calcOverallProgress(); - let overallFileSize = this.calcOverallFileSize(); - let style = { - visibility: 'hidden' - }; - - // only visible if overallProgress is over zero - // or the overallFileSize is greater than 10MB - // or the user is only uploading one file - if(overallProgress !== 0 && overallFileSize > 10000000 || files.length === 1) { - style.visibility = 'visible'; - } return (