Chapril/drop.chapril.org-firefoxsend
Chapril/drop.chapril.org-firefoxsend
25
1
Fork 0
Code Issues Releases Activity

fixes #675. progress on ios

Browse Source
This commit is contained in:
Danny Coates 2018-01-16 13:52:09 -08:00
parent 7fb11ba912
commit 55ed6100e0
No known key found for this signature in database
GPG Key ID: 4C442633C62E00CB
2 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/templates/download.js
View File

@ -6,22 +6,26 @@ module.exports = function(state) {
const transfer = state.transfer; const transfer = state.transfer;
const div = html` const div = html`
<div id="page-one"> <div id="page-one">
<div id="download-progress" class="fadeIn"> <div id="download">
<div id="dl-title" class="title">${state.translate( <div id="download-progress" class="fadeIn">
'downloadingPageProgress', <div id="dl-title" class="title">${state.translate(
{ 'downloadingPageProgress',
filename: state.fileInfo.name, {
size: bytes(state.fileInfo.size) filename: state.fileInfo.name,
} size: bytes(state.fileInfo.size)
)}</div> }
<div class="description">${state.translate('downloadingPageMessage')}</div> )}</div>
${progress(transfer.progressRatio)} <div class="description">${state.translate(
<div class="upload"> 'downloadingPageMessage'
<div class="progress-text">${state.translate( )}</div>
transfer.msg, ${progress(transfer.progressRatio)}
transfer.sizes <div class="upload">
)}</div> <div class="progress-text">${state.translate(
</div> transfer.msg,
transfer.sizes
)}</div>
</div>
</div>
</div> </div>
</div> </div>
`; `;

36
app/templates/upload.js
View File

@ -6,24 +6,26 @@ module.exports = function(state, emit) {
const transfer = state.transfer; const transfer = state.transfer;
const div = html` const div = html`
<div id="upload-progress" class="fadeIn"> <div id="download">
<div class="title" id="upload-filename">${state.translate( <div id="upload-progress" class="fadeIn">
'uploadingPageProgress', <div class="title" id="upload-filename">${state.translate(
{ 'uploadingPageProgress',
filename: transfer.file.name, {
size: bytes(transfer.file.size) filename: transfer.file.name,
} size: bytes(transfer.file.size)
)}</div> }
<div class="description"></div>
${progress(transfer.progressRatio)}
<div class="upload">
<div class="progress-text">${state.translate(
transfer.msg,
transfer.sizes
)}</div> )}</div>
<button id="cancel-upload" title="${state.translate( <div class="description"></div>
'uploadingPageCancel' ${progress(transfer.progressRatio)}
)}" onclick=${cancel}>${state.translate('uploadingPageCancel')}</button> <div class="upload">
<div class="progress-text">${state.translate(
transfer.msg,
transfer.sizes
)}</div>
<button id="cancel-upload" title="${state.translate(
'uploadingPageCancel'
)}" onclick=${cancel}>${state.translate('uploadingPageCancel')}</button>
</div>
</div> </div>
</div> </div>
`; `;