Added Allow/Disallow multiple identities

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

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 () {