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

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

@@ -107,8 +107,18 @@ define([
}
eraseTempSessionValues();
logoutHandlers.forEach(function (h) {
if (typeof (h) === "function") { h(); }
});
if (cb) { cb(); }
};
var logoutHandlers= [];
var onLogout = common.onLogout = function (h) {
if (typeof (h) !== "function") { return; }
if (logoutHandlers.indexOf(h) !== -1) { return; }
logoutHandlers.push(h);
};
var getUserHash = common.getUserHash = function () {
var hash;
@@ -760,6 +770,10 @@ define([
var LOADING = 'loading';
common.addLoadingScreen = function () {
if ($('#' + LOADING).length) {
$('#' + LOADING).show();
return;
}
var $loading = $('<div>', {id: LOADING});
var $container = $('<div>', {'class': 'loadingContainer'});
$container.append('<img class="cryptofist" src="/customize/cryptofist_small.png" />');
@@ -773,9 +787,10 @@ define([
common.removeLoadingScreen = function (cb) {
$('#' + LOADING).fadeOut(750, cb);
};
common.errorLoadingScreen = function (error) {
common.errorLoadingScreen = function (error, transparent) {
$('.spinnerContainer').hide();
$('#' + LOADING).find('p').text(error || Messages.error);
if (transparent) { $('#' + LOADING).css('opacity', 0.8); }
$('#' + LOADING).find('p').html(error || Messages.error);
};
/*