Split application data

This commit is contained in:
RainLoop Team 2016-04-30 02:42:18 +03:00
parent 3215c5f8d3
commit 1391648e1b
22 changed files with 186 additions and 130 deletions

View file

@ -103,6 +103,10 @@ class AbstractApp extends AbstractBoot
return null;
}
getApplicationConfiguration(name, default_) {
return this.applicationConfiguration[name] || default_;
}
/**
* @param {string} link
* @return {boolean}
@ -200,10 +204,10 @@ class AbstractApp extends AbstractBoot
const
kn = require('Knoin/Knoin'),
inIframe = !!Settings.settingsGet('InIframe')
inIframe = !!Settings.appSettingsGet('inIframe')
;
let customLogoutLink = Utils.pString(Settings.settingsGet('CustomLogoutLink'));
let customLogoutLink = Utils.pString(Settings.appSettingsGet('customLogoutLink'));
if (logout)
{
@ -273,7 +277,7 @@ class AbstractApp extends AbstractBoot
ko.components.register('x-script', require('Component/Script'));
// ko.components.register('svg-icon', require('Component/SvgIcon'));
if (Settings.settingsGet('MaterialDesign') && Globals.bAnimationSupported)
if (Settings.appSettingsGet('materialDesign') && Globals.bAnimationSupported)
{
ko.components.register('Checkbox', require('Component/MaterialDesign/Checkbox'));
ko.components.register('CheckboxSimple', require('Component/Checkbox'));

View file

@ -225,7 +225,7 @@ class AdminApp extends AbstractApp
kn.hideLoading();
if (!Settings.settingsGet('AllowAdminPanel'))
if (!Settings.appSettingsGet('allowAdminPanel'))
{
kn.routeOff();
kn.setHash(Links.root(), true);

View file

@ -70,7 +70,7 @@ class AppUser extends AbstractApp
Remote.jsVersion((sResult, oData) => {
if (Enums.StorageResultType.Success === sResult && oData && !oData.Result)
{
if (window.parent && !!Settings.settingsGet('InIframe'))
if (window.parent && !!Settings.appSettingsGet('inIframe'))
{
window.parent.location.reload();
}
@ -79,7 +79,7 @@ class AppUser extends AbstractApp
window.location.reload();
}
}
}, Settings.settingsGet('Version'));
}, Settings.appSettingsGet('version'));
}, {}, 60 * 60 * 1000);
if (Settings.settingsGet('UserBackgroundHash'))
@ -1185,7 +1185,7 @@ class AppUser extends AbstractApp
Globals.$html.removeClass('rl-user-auth').addClass('rl-user-no-auth');
const customLoginLink = Utils.pString(Settings.settingsGet('CustomLoginLink'));
const customLoginLink = Utils.pString(Settings.appSettingsGet('customLoginLink'));
if (!customLoginLink)
{
kn.startScreens([
@ -1239,7 +1239,7 @@ class AppUser extends AbstractApp
var
$LAB = require('$LAB'),
sJsHash = Settings.settingsGet('JsHash'),
sJsHash = Settings.appSettingsGet('jsHash'),
sStartupUrl = Utils.pString(Settings.settingsGet('StartupUrl')),
iContactsSyncInterval = Utils.pInt(Settings.settingsGet('ContactsSyncInterval')),
bGoogle = Settings.settingsGet('AllowGoogleSocial'),
@ -1411,7 +1411,7 @@ class AppUser extends AbstractApp
{
_.defer(() => this.initVerticalLayoutResizer(Enums.ClientSideKeyName.FolderListSize));
if (Tinycon && Settings.settingsGet('FaviconStatus') && !Settings.settingsGet('Filtered'))
if (Tinycon && Settings.appSettingsGet('faviconStatus') && !Settings.appSettingsGet('listPermanentFiltered'))
{
Tinycon.setOptions({
fallback: false