diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview_iterator.js b/js/components/ascribe_uploader/file_drag_and_drop_preview_iterator.js index e3a6af87..9cc7fc4d 100644 --- a/js/components/ascribe_uploader/file_drag_and_drop_preview_iterator.js +++ b/js/components/ascribe_uploader/file_drag_and_drop_preview_iterator.js @@ -3,7 +3,7 @@ import React from 'react'; import FileDragAndDropPreview from './file_drag_and_drop_preview'; -//import FileDragAndDropPreviewProgress from './file_drag_and_drop_preview_progress'; +import FileDragAndDropPreviewProgress from './file_drag_and_drop_preview_progress'; let FileDragAndDropPreviewIterator = React.createClass({ @@ -40,7 +40,7 @@ let FileDragAndDropPreviewIterator = React.createClass({ } })} - {/* */} + ); } else { diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js b/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js index 2d99104f..4d01f822 100644 --- a/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js +++ b/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js @@ -10,8 +10,7 @@ let FileDragAndDropPreviewProgress = React.createClass({ calcOverallProgress() { let overallProgress = 0; let sizeOfAllFiles = 0; - let files = this.props.files.filter((file) => file.status !== 'deleted' || file.status !== 'canceled'); - console.log(this.props.files.filter); + let files = this.props.files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled'); for(let i = 0; i < files.length; i++) { sizeOfAllFiles += files[i].size; @@ -22,16 +21,22 @@ let FileDragAndDropPreviewProgress = React.createClass({ } - return overallProgress.toFixed(2); + return overallProgress; }, render() { - return ( - - Overall progress: {this.calcOverallProgress()}% - - ); + let overallProgress = this.calcOverallProgress(); + + if(overallProgress !== 0) { + return ( + + Overall progress: {overallProgress.toFixed(2)}% + + ); + } else { + return null; + } } });