Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Allow/Disallow multiple identities

Browse source
This commit is contained in:
RainLoop Team 2015-05-18 00:38:20 +04:00
parent 28d93f70ae
commit 2f482a6288
49 changed files with 32740 additions and 32243 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/App/Abstract.js
View file

@ -225,7 +225,6 @@
{
var
kn = require('Knoin/Knoin'),
sStartupUrl = Utils.pString(Settings.settingsGet('StartupUrl')),
sCustomLogoutLink = Utils.pString(Settings.settingsGet('CustomLogoutLink')),
bInIframe = !!Settings.settingsGet('InIframe')
;
@ -235,7 +234,6 @@
if (bLogout)
{
sStartupUrl = '';
this.clearClientSideToken();
}
@ -244,11 +242,6 @@
window.close();
}
if (bAdmin)
{
sStartupUrl = '';
}
sCustomLogoutLink = sCustomLogoutLink || (bAdmin ? Links.rootAdmin() : Links.rootUser());
if (bLogout && window.location.href !== sCustomLogoutLink)
@ -267,7 +260,7 @@
else
{
kn.routeOff();
kn.setHash(Links.root(sStartupUrl), true);
kn.setHash(Links.root(), true);
kn.routeOff();
_.delay(function () {

8
dev/App/User.js
View file

@ -1273,6 +1273,7 @@
self = this,
$LAB = require('$LAB'),
sJsHash = Settings.settingsGet('JsHash'),
sStartupUrl = Utils.pString(Settings.settingsGet('StartupUrl')),
iContactsSyncInterval = Utils.pInt(Settings.settingsGet('ContactsSyncInterval')),
bGoogle = Settings.settingsGet('AllowGoogleSocial'),
bFacebook = Settings.settingsGet('AllowFacebookSocial'),
@ -1314,6 +1315,13 @@
if (bValue)
{
if ('' !== sStartupUrl)
{
kn.routeOff();
kn.setHash(Links.root(sStartupUrl), true);
kn.routeOn();
}
if ($LAB && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP))
{
var fOpenpgpCallback = function (openpgp) {