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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz
2018-06-12 15:50:53 +02:00
parent 54b52d681c d558b9e3e8
commit ff25929c18
7 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/translations/messages.fr.js
View File

@@ -618,7 +618,7 @@ define(function () {
out.upload_mustLogin = "Vous devez vous connecter pour importer un fichier"; out.upload_mustLogin = "Vous devez vous connecter pour importer un fichier";
out.download_button = "Déchiffrer et télécharger"; out.download_button = "Déchiffrer et télécharger";
out.download_mt_button = "Télécharger"; out.download_mt_button = "Télécharger";
out.download_resourceNotAvailable = "Le fichier demandé n'est pas disponible..."; out.download_resourceNotAvailable = "Le fichier demandé n'est pas disponible... Appuyez sur Échap pour continuer.";
out.todo_title = "CryptTodo"; out.todo_title = "CryptTodo";
out.todo_newTodoNamePlaceholder = "Décrivez votre tâche..."; out.todo_newTodoNamePlaceholder = "Décrivez votre tâche...";

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

@@ -622,7 +622,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.download_resourceNotAvailable = "The requested resource was not available... Press Esc to continue.";
out.todo_title = "CryptTodo"; out.todo_title = "CryptTodo";
out.todo_newTodoNamePlaceholder = "Describe your task..."; out.todo_newTodoNamePlaceholder = "Describe your task...";

4
www/common/cryptpad-common.js
View File

@@ -708,9 +708,11 @@ define([
var update = updateLocalVersion(NewConfig.requireConf && NewConfig.requireConf.urlArgs); var update = updateLocalVersion(NewConfig.requireConf && NewConfig.requireConf.urlArgs);
if (update) { if (update) {
postMessage('DISCONNECT'); postMessage('DISCONNECT');
return;
} }
common.onNetworkReconnect.fire(data);
}); });
common.onNetworkReconnect.fire(data); break; break;
} }
// Messenger // Messenger
case 'CONTACTS_MESSAGE': { case 'CONTACTS_MESSAGE': {

8
www/common/media-tag.js
View File

@@ -96,11 +96,17 @@
// Download a blob from href // Download a blob from href
var download = function (src, cb) { var download = function (src, _cb) {
var cb = function (e, res) {
_cb(e, res);
cb = function () {};
};
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', src, true); xhr.open('GET', src, true);
xhr.responseType = 'arraybuffer'; xhr.responseType = 'arraybuffer';
xhr.onerror = function () { return void cb("XHR_ERROR"); };
xhr.onload = function () { xhr.onload = function () {
// Error? // Error?
if (/^4/.test('' + this.status)) { return void cb("XHR_ERROR " + this.status); } if (/^4/.test('' + this.status)) { return void cb("XHR_ERROR " + this.status); }

1
www/common/sframe-common.js
View File

@@ -443,6 +443,7 @@ define([
$err.find('a').click(function () { $err.find('a').click(function () {
funcs.gotoURL(); funcs.gotoURL();
}); });
UI.findOKButton().click();
UI.errorLoadingScreen($err, true, true); UI.errorLoadingScreen($err, true, true);
}); });

1
www/file/file-crypto.js
View File

@@ -65,6 +65,7 @@ define([
xhr.setRequestHeader('Range', 'bytes=0-1'); xhr.setRequestHeader('Range', 'bytes=0-1');
xhr.responseType = 'arraybuffer'; xhr.responseType = 'arraybuffer';
xhr.onerror= function () { return CB('XHR_ERROR'); };
xhr.onload = function () { xhr.onload = function () {
if (/^4/.test('' + this.status)) { return CB('XHR_ERROR'); } if (/^4/.test('' + this.status)) { return CB('XHR_ERROR'); }
var res = new Uint8Array(xhr.response); var res = new Uint8Array(xhr.response);

4
www/file/inner.js
View File

@@ -95,7 +95,9 @@ define([
FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) { FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) {
if (e) { if (e) {
if (e === 'XHR_ERROR') { if (e === 'XHR_ERROR') {
return void UI.errorLoadingScreen(Messages.download_resourceNotAvailable); return void UI.errorLoadingScreen(Messages.download_resourceNotAvailable, false, function () {
common.gotoURL('/file/');
});
} }
return void console.error(e); return void console.error(e);
} }