mentos1386/send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #310 from mozilla/addresses159

Browse source 
if the download card is pressed, the expired card shows up properly
This commit is contained in:
Danny Coates 2017-07-25 11:29:27 -07:00 committed by GitHub
commit 109617d817
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/download.js
View file

@ -144,12 +144,15 @@ $(document).ready(function() {
cd6: err cd6: err
}); });
document.l10n.formatValue('expiredPageHeader').then(translated => { if (err.message === 'notfound') {
location.reload();
} else {
document.l10n.formatValue('errorPageHeader').then(translated => {
$('.title').text(translated); $('.title').text(translated);
}); });
$('#download-btn').attr('hidden', true); $('#download-btn').attr('hidden', true);
$('#expired-img').removeAttr('hidden'); $('#expired-img').removeAttr('hidden');
console.log('The file has expired, or has already been deleted.'); }
return; return;
}) })
.then(([decrypted, fname]) => { .then(([decrypted, fname]) => {

2
frontend/src/fileReceiver.js
View file

@ -20,7 +20,7 @@ class FileReceiver extends EventEmitter {
xhr.onload = function(event) { xhr.onload = function(event) {
if (xhr.status === 404) { if (xhr.status === 404) {
reject( reject(
new Error('The file has expired, or has already been deleted.') new Error('notfound')
); );
return; return;
} }