From 8e98a7bff7f049cadd3df02af67ac5e38a278bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Fri, 4 Sep 2015 14:54:39 +0200 Subject: [PATCH 01/17] show overall progress --- js/app.js | 1 - .../file_drag_and_drop_preview.js | 2 +- .../file_drag_and_drop_preview_iterator.js | 43 +++++++++++-------- .../file_drag_and_drop_preview_progress.js | 38 ++++++++++++++++ .../react_s3_fine_uploader.js | 1 - .../ikonotv_accordion_list_item.js | 3 -- .../whitelabel/wallet/wallet_routes.js | 2 +- js/third_party/ga.js | 1 - sass/ascribe_uploader.scss | 8 ++++ 9 files changed, 72 insertions(+), 27 deletions(-) create mode 100644 js/components/ascribe_uploader/file_drag_and_drop_preview_progress.js 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 = (
-