web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better warning in case of errors in /file/

Browse Source
This commit is contained in:
ansuz
2018-01-16 16:52:06 +01:00
parent 4c49cd7592
commit 3858aa976a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/translations/messages.js
View File

@@ -581,6 +581,7 @@ define(function () {
out.upload_mustLogin = "You must be logged in to upload files"; out.upload_mustLogin = "You must be logged in to upload files";
out.download_button = "Decrypt & Download"; out.download_button = "Decrypt & Download";
out.download_mt_button = "Download"; out.download_mt_button = "Download";
out.download_resourceNotAvailable = "The requested resource was not available...";
out.todo_title = "CryptTodo"; out.todo_title = "CryptTodo";
out.todo_newTodoNamePlaceholder = "Describe your task..."; out.todo_newTodoNamePlaceholder = "Describe your task...";

10
www/file/inner.js
View File

@@ -91,7 +91,12 @@ define([
var key = Nacl.util.decodeBase64(cryptKey); var key = Nacl.util.decodeBase64(cryptKey);
FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) { FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) {
if (e) { return void console.error(e); } if (e) {
if (e === 'XHR_ERROR') {
return void UI.errorLoadingScreen(Messages.download_resourceNotAvailable);
}
return void console.error(e);
}
var title = document.title = metadata.name; var title = document.title = metadata.name;
Title.updateTitle(title || Title.defaultTitle); Title.updateTitle(title || Title.defaultTitle);
toolbar.addElement(['pageTitle'], {pageTitle: title}); toolbar.addElement(['pageTitle'], {pageTitle: title});
@@ -238,10 +243,9 @@ define([
} }
// we're in upload mode // we're in upload mode
if (!common.isLoggedIn()) { if (!common.isLoggedIn()) {
UI.removeLoadingScreen();
return UI.alert(Messages.upload_mustLogin, function () { return UI.alert(Messages.upload_mustLogin, function () {
UI.errorLoadingScreen(Messages.upload_mustLogin);
common.setLoginRedirect(function () { common.setLoginRedirect(function () {
common.gotoURL('/login/'); common.gotoURL('/login/');
}); });