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

Do not redirect to home page when logging out from another tab

Browse Source
This commit is contained in:
yflory
2017-02-08 12:54:07 +01:00
parent 702798f65a
commit 914c442615
10 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
customize.dist/fsStore.js
View File

@@ -176,7 +176,18 @@ define([
window.location.reload();
} else if (o && !n) {
//window.location.reload();
window.location.href = '/';
//window.location.href = '/';
$(window).on('keyup', function (e) {
if (e.keyCode === 27) {
Cryptpad.removeLoadingScreen();
}
});
Cryptpad.logout();
Cryptpad.addLoadingScreen();
Cryptpad.errorLoadingScreen(Messages.onLogout, true);
if (exp.info) {
exp.info.network.disconnect();
}
}
});

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

@@ -25,6 +25,7 @@ define(function () {
out.websocketError = 'Impossible de se connecter au serveur WebSocket...';
out.typeError = "Ce document temps-réel n'est pas compatible avec l'application sélectionnée";
out.onLogout = 'Vous êtes déconnecté de votre compte utilisateur, <a href="/" target="_blank">cliquez ici</a> pour vous authentifier<br>ou appuyez sur <em>Échap</em> pour accéder au document en mode lecture seule.';
out.loading = "Chargement...";
out.error = "Erreur";

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

@@ -29,6 +29,7 @@ define(function () {
out.websocketError = 'Unable to connect to the websocket server...';
out.typeError = "That realtime document is not compatible with the selected application";
out.onLogout = 'You are logged out, <a href="/" target="_blank">click here</a> to log in<br>or press <em>Escape</em> to access your pad in read-only mode.';
out.loading = "Loading...";
out.error = "Error";