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:
yflory 2017-02-07 16:49:31 +01:00
commit b3e73b0f0b
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
customize.dist/main.js
View File

@ -63,7 +63,7 @@ define([
tag: 'a', tag: 'a',
attributes: { attributes: {
'class': 'newdoc', 'class': 'newdoc',
'href': '/' + el, 'href': '/' + el + '/',
'target': '_blank' 'target': '_blank'
}, },
content: Messages['button_new' + el] // Pretty name of the language value content: Messages['button_new' + el] // Pretty name of the language value
@ -86,7 +86,7 @@ define([
sessionStorage.login_pass = passwd; sessionStorage.login_pass = passwd;
sessionStorage.login_rmb = remember; sessionStorage.login_rmb = remember;
sessionStorage.login = 1; sessionStorage.login = 1;
document.location.href = '/user'; document.location.href = '/user/';
}); });
$('button.register').click(function (e) { $('button.register').click(function (e) {
var username = $('#name').val(); var username = $('#name').val();
@ -96,10 +96,10 @@ define([
sessionStorage.login_pass = passwd; sessionStorage.login_pass = passwd;
sessionStorage.login_rmb = remember; sessionStorage.login_rmb = remember;
sessionStorage.register = 1; sessionStorage.register = 1;
document.location.href = '/user'; document.location.href = '/user/';
}); });
$('button.nologin').click(function (e) { $('button.nologin').click(function (e) {
document.location.href = '/drive'; document.location.href = '/drive/';
}); });
$('button.knowmore').click(function (e) { $('button.knowmore').click(function (e) {
e.preventDefault(); e.preventDefault();

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

@ -82,6 +82,19 @@ define([
if (cb) { cb(); } if (cb) { cb(); }
}; };
var eraseTempSessionValues = common.eraseTempSessionValues = function () {
// delete sessionStorage values that might have been left over
// from the main page's /user redirect
[
'login_user',
'login_pass',
'login_remember',
'register'
].forEach(function (k) {
delete sessionStorage[k];
});
};
var logout = common.logout = function (cb) { var logout = common.logout = function (cb) {
[ [
userNameKey, userNameKey,
@ -97,6 +110,8 @@ define([
if (!localStorage[fileHashKey]) { if (!localStorage[fileHashKey]) {
localStorage[fileHashKey] = common.createRandomHash(); localStorage[fileHashKey] = common.createRandomHash();
} }
eraseTempSessionValues();
if (cb) { cb(); } if (cb) { cb(); }
}; };