Fix js error (TypeError: Cannot call method 'settingsGet' of undefined)

+ small other fixes
This commit is contained in:
RainLoop Team 2013-11-21 02:00:30 +04:00
parent cf0968b5a8
commit 726fa6982b
12 changed files with 87 additions and 124 deletions

View file

@ -15158,15 +15158,12 @@ AbstractApp.prototype.settingsSet = function (sName, mValue)
AbstractApp.prototype.setTitle = function (sTitle)
{
sTitle = ((0 < sTitle.length) ? sTitle + ' - ' : '') +
this.settingsGet('Title') || '';
RL.settingsGet('Title') || '';
if (sTitle !== window.document.title)
{
window.document.title = sTitle;
_.delay(function () {
window.document.title = sTitle;
_.delay(function () {
window.document.title = sTitle;
}, 5);
}
}, 5);
};
/**
@ -15176,8 +15173,8 @@ AbstractApp.prototype.setTitle = function (sTitle)
AbstractApp.prototype.loginAndLogoutReload = function (bLogout, bClose)
{
var
sCustomLogoutLink = Utils.pString(this.settingsGet('CustomLogoutLink')),
bInIframe = !!this.settingsGet('InIframe')
sCustomLogoutLink = Utils.pString(RL.settingsGet('CustomLogoutLink')),
bInIframe = !!RL.settingsGet('InIframe')
;
bLogout = Utils.isUnd(bLogout) ? false : !!bLogout;
@ -15260,7 +15257,7 @@ function RainLoopApp()
$.wakeUp(function (iSleepTime) {
RL.remote().jsInfo(Utils.emptyFunction, {
'Version': this.settingsGet('Version'),
'Version': RL.settingsGet('Version'),
'WakeUpTime': Math.round(iSleepTime / 1000)
}, true);
}, {}, 60 * 60 * 1000);
@ -15805,23 +15802,23 @@ RainLoopApp.prototype.bootstart = function ()
var
sCustomLoginLink = '',
sJsHash = this.settingsGet('JsHash'),
bGoogle = this.settingsGet('AllowGoogleSocial'),
bFacebook = this.settingsGet('AllowFacebookSocial'),
bTwitter = this.settingsGet('AllowTwitterSocial')
sJsHash = RL.settingsGet('JsHash'),
bGoogle = RL.settingsGet('AllowGoogleSocial'),
bFacebook = RL.settingsGet('AllowFacebookSocial'),
bTwitter = RL.settingsGet('AllowTwitterSocial')
;
if (!this.settingsGet('AllowChangePassword'))
if (!RL.settingsGet('AllowChangePassword'))
{
Utils.removeSettingsViewModel(SettingsChangePasswordScreen);
}
if (!this.settingsGet('AllowAdditionalAccounts'))
if (!RL.settingsGet('AllowAdditionalAccounts'))
{
Utils.removeSettingsViewModel(SettingsAccounts);
}
if (this.settingsGet('AllowIdentities'))
if (RL.settingsGet('AllowIdentities'))
{
Utils.removeSettingsViewModel(SettingsIdentity);
}
@ -15835,7 +15832,7 @@ RainLoopApp.prototype.bootstart = function ()
Utils.removeSettingsViewModel(SettingsSocialScreen);
}
if (!this.settingsGet('AllowThemes'))
if (!RL.settingsGet('AllowThemes'))
{
Utils.removeSettingsViewModel(SettingsThemes);
}
@ -15866,7 +15863,7 @@ RainLoopApp.prototype.bootstart = function ()
window.SimplePace.sleep();
}
if (!!this.settingsGet('Auth'))
if (!!RL.settingsGet('Auth'))
{
this.setTitle(Utils.i18n('TITLES/LOADING'));
@ -15940,7 +15937,7 @@ RainLoopApp.prototype.bootstart = function ()
}
else
{
sCustomLoginLink = Utils.pString(this.settingsGet('CustomLoginLink'));
sCustomLoginLink = Utils.pString(RL.settingsGet('CustomLoginLink'));
if (!sCustomLoginLink)
{
kn.hideLoading();
@ -16005,16 +16002,16 @@ $window.unload(function () {
});
// export
window.rl = window.rl || {};
window.rl.addHook = Plugins.addHook;
window.rl.settingsGet = Plugins.mainSettingsGet;
window.rl.remoteRequest = Plugins.remoteRequest;
window.rl.pluginSettingsGet = Plugins.settingsGet;
window.rl.addSettingsViewModel = Utils.addSettingsViewModel;
window.rl.createCommand = Utils.createCommand;
window['rl'] = window['rl'] || {};
window['rl']['addHook'] = Plugins.addHook;
window['rl']['settingsGet'] = Plugins.mainSettingsGet;
window['rl']['remoteRequest'] = Plugins.remoteRequest;
window['rl']['pluginSettingsGet'] = Plugins.settingsGet;
window['rl']['addSettingsViewModel'] = Utils.addSettingsViewModel;
window['rl']['createCommand'] = Utils.createCommand;
window.rl.EmailModel = EmailModel;
window.rl.Enums = Enums;
window['rl']['EmailModel'] = EmailModel;
window['rl']['Enums'] = Enums;
window['__RLBOOT'] = function (fCall) {