natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #307 from mozilla/ui 

don't show error page on upload cancel
This commit is contained in:
Daniela Arcese 2017-07-25 11:48:34 -04:00 committed by GitHub
parent 5a564e2c37 ba277b9382
commit 5996bceef7
2 changed files with 2102 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/upload.js
View File

@ -306,6 +306,11 @@ $(document).ready(function() {
}); });
}) })
.catch(err => { .catch(err => {
// err is 0 when coming from a cancel upload event
if (err === 0) {
return;
}
// only show error page when the error is anything other than user cancelling the upload
Raven.captureException(err); Raven.captureException(err);
$('#page-one').attr('hidden', true); $('#page-one').attr('hidden', true);
$('#upload-progress').attr('hidden', true); $('#upload-progress').attr('hidden', true);

2398
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff