diff --git a/src/plugins/DragDrop.js b/src/plugins/DragDrop.js
index 6ad71b2a6..a2c408fd5 100644
--- a/src/plugins/DragDrop.js
+++ b/src/plugins/DragDrop.js
@@ -146,7 +146,7 @@ export default class DragDrop extends Plugin {
acquiredFiles: newFiles
})
- this.core.emitter.emit('new-next')
+ // this.core.emitter.emit('next')
//
// newFiles.forEach((newFile) => {
// this.files.push(newFile)
diff --git a/src/plugins/Modal.js b/src/plugins/Modal.js
index 5b7732f0b..21ed65c6f 100644
--- a/src/plugins/Modal.js
+++ b/src/plugins/Modal.js
@@ -102,7 +102,6 @@ export default class Modal extends Plugin {
-
@@ -140,32 +139,21 @@ export default class Modal extends Plugin {
this.core.log(pluginName)
this.core.getPlugin(pluginName).focus()
-
- // Remove `next` buttons provided by plugins, since Modal has its own
- // document.querySelector('.UppyNextBtn').remove()
}
events () {
// Listen for allDone event to close all tabs
this.core.emitter.on('allDone', () => this.allDone())
- this.core.emitter.on('file-add', (data) => {
- this.nextButton.classList.add('is-active')
+ // this.core.emitter.on('file-add', (data) => {
+ // this.nextButton.classList.add('is-active')
+ //
+ // const files = Object.keys(this.core.state.selectedFiles)
+ // const selectedFileCount = files.length
+ // this.nextButton.innerHTML = this.core.i18n('uploadFiles', {'smart_count': selectedFileCount})
+ // })
- const files = Object.keys(data.acquiredFiles)
- const selectedCount = files.length
-
- // How many files have been selected totally
- this.core.totalFilesSelectedCount = this.core.totalFilesSelectedCount + selectedCount
-
- this.nextButton.innerHTML = this.core.i18n('uploadFiles', {'smart_count': this.core.totalFilesSelectedCount})
-
- files.forEach((file) => {
- this.core.log(`These files have been selected: ${data.acquiredFiles[file]}`)
- })
- })
-
- this.core.emitter.on('reset', () => this.nextButton.classList.remove('is-active'))
+ // this.core.emitter.on('reset', () => this.nextButton.classList.remove('is-active'))
// Close the Modal on esc key press
document.body.addEventListener('keyup', (event) => {
@@ -215,8 +203,8 @@ export default class Modal extends Plugin {
// When `next` (upload) button is clicked, emit `next` event,
// so that plugins can proceed to the next stage
- this.nextButton = document.querySelector('.UppyModal-next')
- this.nextButton.addEventListener('click', () => this.core.emitter.emit('next'))
+ // this.nextButton = document.querySelector('.UppyModal-next')
+ // this.nextButton.addEventListener('click', () => this.core.emitter.emit('next'))
this.events()
}
diff --git a/src/scss/_modal.scss b/src/scss/_modal.scss
index 6b2645cd0..0776546a4 100644
--- a/src/scss/_modal.scss
+++ b/src/scss/_modal.scss
@@ -126,7 +126,8 @@
}
.UppyModalContent-panel {
- height: 88%;
+ // height: 88%;
+ height: 100%;
}
.UppyModalContent-panel[aria-hidden] {
diff --git a/src/scss/_progressdrawer.scss b/src/scss/_progressdrawer.scss
index f55b6bb52..051f03b8a 100644
--- a/src/scss/_progressdrawer.scss
+++ b/src/scss/_progressdrawer.scss
@@ -120,6 +120,7 @@
height: 40px;
transition: background-color 0.5s;
color: $color-black;
+ font-size: 13px;
font-weight: bold;
// border-top: 1px solid $color-asphalt-gray;
cursor: pointer;
diff --git a/website/src/examples/modal/app.es6 b/website/src/examples/modal/app.es6
index bdaf9f7ad..e5a2e7c41 100644
--- a/website/src/examples/modal/app.es6
+++ b/website/src/examples/modal/app.es6
@@ -5,11 +5,11 @@ import ProgressDrawer from '../../../../src/plugins/ProgressDrawer.js'
const uppy = new Uppy({debug: true})
uppy
.use(Modal, {trigger: '#uppyModalOpener'})
- .use(ProgressBar, {target: Modal})
+ // .use(ProgressBar, {target: Modal})
.use(DragDrop, {target: Modal})
.use(GoogleDrive, {target: Modal})
- .use(Dummy, {target: Modal})
- .use(Present, {target: Modal})
+ // .use(Dummy, {target: Modal})
+ // .use(Present, {target: Modal})
.use(Tus10, {endpoint: 'http://master.tus.io:8080/files/'})
.use(ProgressDrawer, {target: Modal})
.run()