diff --git a/js/app.js b/js/app.js
index 6dcf58bf..addd0494 100644
--- a/js/app.js
+++ b/js/app.js
@@ -45,7 +45,6 @@ requests.defaults({
class AppGateway {
-
start() {
let settings;
let subdomain = window.location.host.split('.')[0];
diff --git a/js/components/ascribe_uploader/file_drag_and_drop_preview.js b/js/components/ascribe_uploader/file_drag_and_drop_preview.js
index 9c6cdbdd..05c4a688 100644
--- a/js/components/ascribe_uploader/file_drag_and_drop_preview.js
+++ b/js/components/ascribe_uploader/file_drag_and_drop_preview.js
@@ -72,7 +72,7 @@ let FileDragAndDropPreview = React.createClass({
if(this.props.areAssetsEditable) {
removeBtn = (
-
0) {
return (
-
- {this.props.files.map((file, i) => {
- if(file.status !== 'deleted' && file.status !== 'canceled' && file.size !== -1) {
- return (
-
- );
- } else {
- return null;
- }
- })}
+
+
+ {this.props.files.map((file, i) => {
+ if(file.status !== 'deleted' && file.status !== 'canceled' && file.size !== -1) {
+ return (
+
+ );
+ } else {
+ return null;
+ }
+ })}
+
+ {/*
*/}
);
} 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
new file mode 100644
index 00000000..2d99104f
--- /dev/null
+++ b/js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js
@@ -0,0 +1,38 @@
+'use strict';
+
+import React from 'react';
+
+let FileDragAndDropPreviewProgress = React.createClass({
+ propTypes: {
+ files: React.PropTypes.array
+ },
+
+ 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);
+
+ for(let i = 0; i < files.length; i++) {
+ sizeOfAllFiles += files[i].size;
+ }
+
+ for(let i = 0; i < files.length; i++) {
+ overallProgress += files[i].size / sizeOfAllFiles * files[i].progress;
+ }
+
+
+ return overallProgress.toFixed(2);
+ },
+
+ render() {
+ return (
+
+ Overall progress: {this.calcOverallProgress()}%
+
+ );
+ }
+});
+
+export default FileDragAndDropPreviewProgress;
\ No newline at end of file
diff --git a/js/components/ascribe_uploader/react_s3_fine_uploader.js b/js/components/ascribe_uploader/react_s3_fine_uploader.js
index 8ecaf40b..31b1590a 100644
--- a/js/components/ascribe_uploader/react_s3_fine_uploader.js
+++ b/js/components/ascribe_uploader/react_s3_fine_uploader.js
@@ -461,7 +461,6 @@ var ReactS3FineUploader = React.createClass({
},
onProgress(id, name, uploadedBytes, totalBytes) {
-
let newState = React.addons.update(this.state, {
filesToUpload: { [id]: {
progress: { $set: (uploadedBytes / totalBytes) * 100} }
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js b/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
index c0a239cb..b716914a 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ascribe_accordion_list/ikonotv_accordion_list_item.js
@@ -1,7 +1,6 @@
'use strict';
import React from 'react';
-import Router from 'react-router';
import AccordionListItemPiece from '../../../../../ascribe_accordion_list/accordion_list_item_piece';
@@ -17,8 +16,6 @@ import IkonotvSubmitButton from '../ascribe_buttons/ikonotv_submit_button';
import AclProxy from '../../../../../acl_proxy';
-import AclButton from '../../../../../ascribe_buttons/acl_button';
-
import { getLangText } from '../../../../../../utils/lang_utils';
import { mergeOptions } from '../../../../../../utils/general_utils';
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 40f092d6..62c1d255 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -71,7 +71,7 @@ let ROUTES = {
-
+
diff --git a/js/third_party/ga.js b/js/third_party/ga.js
index 52832623..f95450cb 100644
--- a/js/third_party/ga.js
+++ b/js/third_party/ga.js
@@ -3,7 +3,6 @@
import alt from '../alt';
import EventActions from '../actions/event_actions';
-
class GoogleAnalyticsHandler {
constructor() {
this.bindActions(EventActions);
diff --git a/sass/ascribe_uploader.scss b/sass/ascribe_uploader.scss
index 2aab021a..e3b5d1c1 100644
--- a/sass/ascribe_uploader.scss
+++ b/sass/ascribe_uploader.scss
@@ -29,6 +29,14 @@
}
}
+.file-drag-and-drop-preview-iterator {
+ text-align: right;
+
+ > div:first-child {
+ text-align: center;
+ }
+}
+
.file-drag-and-drop .file-drag-and-drop-dialog > p:first-child {
font-size: 1.5em !important;