1.10 beta

This commit is contained in:
RainLoop Team 2016-05-02 23:42:29 +03:00
parent 116de6fd45
commit ecf23a4f6d
27 changed files with 259 additions and 158 deletions

View file

@ -204,6 +204,7 @@ class AbstractApp extends AbstractBoot
const
kn = require('Knoin/Knoin'),
mobile = Settings.appSettingsGet('mobile'),
inIframe = !!Settings.appSettingsGet('inIframe')
;
@ -219,7 +220,7 @@ class AbstractApp extends AbstractBoot
window.close();
}
customLogoutLink = customLogoutLink || (admin ? Links.rootAdmin() : Links.rootUser());
customLogoutLink = customLogoutLink || (admin ? Links.rootAdmin(mobile) : Links.rootUser(mobile));
if (logout && window.location.href !== customLogoutLink)
{