ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bug in progress method

This commit is contained in:
Tim Daubenschütz 2015-09-07 17:49:38 +02:00
parent 1c4bf9915c
commit 3197fad1b6
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/ascribe_uploader/file_drag_and_drop_preview_iterator.js
View File

@ -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({
}
})}
</div>
{/* <FileDragAndDropPreviewProgress files={this.props.files} /> */}
<FileDragAndDropPreviewProgress files={this.props.files} />
</div>
);
} else {

23
js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js
View File

@ -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 (
<span
className="file-drag-and-drop-progress-time">
Overall progress: {this.calcOverallProgress()}%
</span>
);
let overallProgress = this.calcOverallProgress();
if(overallProgress !== 0) {
return (
<span
className="file-drag-and-drop-progress-time">
Overall progress: {overallProgress.toFixed(2)}%
</span>
);
} else {
return null;
}
}
});