Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-07-23 10:18:40 +00:00
Code Issues Projects Releases Wiki Activity

For now: remove upload button from Modal itself,, don’t use Presenter, Dummy and ProgressBar. Update styles

Browse source
This commit is contained in:
Artur Paikin 2016-03-28 00:08:42 -04:00
parent 14c6970151
commit 53e39cc201
5 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/DragDrop.js
View file

@ -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)

32
src/plugins/Modal.js
View file

@ -102,7 +102,6 @@ export default class Modal extends Plugin {
<div class="UppyModalContent">
<div class="UppyModal-presenter"></div>
<div class="UppyModal-progress">
<button class="UppyModal-next js-UppyModal-next">${this.core.i18n('upload')}</button>
<div class="UppyModal-progressBarContainer"></div>
</div>
</div>
@ -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()
}

3
src/scss/_modal.scss
View file

@ -126,7 +126,8 @@
}
.UppyModalContent-panel {
height: 88%;
// height: 88%;
height: 100%;
}
.UppyModalContent-panel[aria-hidden] {

1
src/scss/_progressdrawer.scss
View file

@ -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;

6
website/src/examples/modal/app.es6
View file

@ -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()