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

@ -238,8 +238,8 @@ class HtmlEditor
const
config = Globals.oHtmlEditorDefaultConfig,
language = Settings.settingsGet('Language'),
allowSource = !!Settings.settingsGet('AllowHtmlEditorSourceButton'),
biti = !!Settings.settingsGet('AllowHtmlEditorBitiButtons')
allowSource = !!Settings.appSettingsGet('allowHtmlEditorSourceButton'),
biti = !!Settings.appSettingsGet('allowHtmlEditorBitiButtons')
;
if ((allowSource || !biti) && !config.toolbarGroups.__cfgInited)

View file

@ -10,11 +10,13 @@ class Links
this.sBase = '#/';
this.sServer = './?';
this.sVersion = Settings.settingsGet('Version');
this.sVersion = Settings.appSettingsGet('version');
this.sWebPrefix = Settings.appSettingsGet('webPath') || '';
this.sVersionPrefix = Settings.appSettingsGet('webVersionPath') || 'rainloop/v/' + this.sVersion + '/';
this.sAdminPath = Settings.appSettingsGet('adminPath') || 'admin';
this.sAuthSuffix = Settings.settingsGet('AuthAccountHash') || '0';
this.sWebPrefix = Settings.settingsGet('WebPath') || '';
this.sAdminPath = Settings.settingsGet('AdminPath') || 'admin';
this.sVersionPrefix = Settings.settingsGet('WebVersionPath') || 'rainloop/v/' + this.sVersion + '/';
this.sStaticPrefix = this.sVersionPrefix + 'static/';
}

View file

@ -13,6 +13,7 @@
$ = require('$'),
ko = require('ko'),
Autolinker = require('Autolinker'),
JSON = require('JSON'),
JSEncrypt = require('JSEncrypt'),
Mime = require('Common/Mime'),
@ -1433,6 +1434,28 @@
return (sResult === sFileName) ? '' : sResult;
};
Utils.configurationScriptTagCache = {};
/**
* @param {string} sConfiguration
* @return {object}
*/
Utils.getConfigurationFromScriptTag = function (sConfiguration)
{
var oResult = {};
if (!Utils.configurationScriptTagCache[sConfiguration])
{
Utils.configurationScriptTagCache[sConfiguration] = $('script[type="application/json"][data-configuration="' + sConfiguration + '"]');
}
try {
oResult = JSON.parse(Utils.configurationScriptTagCache[sConfiguration].text());
} catch (e) {/* eslint-disable-line no-empty */}
return oResult;
};
/**
* @param {string} sFileName
* @return {string}