Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
+ 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
Download patch file Download diff file Expand all files Collapse all files

14
dev/Admin/General.js
View file

@ -35,20 +35,6 @@ function AdminGeneral()
return Utils.convertLangName(this.mainLanguage());
}, this);
this.languagesOptions = ko.computed(function () {
return _.map(oData.languages(), function (sLanguage) {
var
sName = Utils.convertLangName(sLanguage),
sEn = Utils.convertLangName(sLanguage, true)
;
return {
'optValue': sLanguage,
'optText': sName + (sEn !== sName ? ' (' + sEn + ')' : '')
};
});
});
this.contactsSupported = RL.settingsGet('ContactsIsSupported');
this.contactsIsAllowed = RL.settingsGet('ContactsIsAllowed');
this.weakPassword = !!RL.settingsGet('WeakPassword');

15
dev/Boots/AbstractApp.js
View file

@ -143,15 +143,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);
};
/**
@ -161,8 +158,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;

6
dev/Boots/AdminApp.js
View file

@ -200,7 +200,7 @@ AdminApp.prototype.bootstart = function ()
kn.hideLoading();
if (!this.settingsGet('AllowAdminPanel'))
if (!RL.settingsGet('AllowAdminPanel'))
{
kn.routeOff();
kn.setHash(RL.link().root(), true);
@ -212,10 +212,10 @@ AdminApp.prototype.bootstart = function ()
}
else
{
if (!!this.settingsGet('Auth'))
if (!!RL.settingsGet('Auth'))
{
// TODO
// if (!this.settingsGet('AllowPackages') && AdminPackages)
// if (!RL.settingsGet('AllowPackages') && AdminPackages)
// {
// Utils.disableSettingsViewModel(AdminPackages);
// }

22
dev/Boots/RainLoopApp.js
View file

@ -19,7 +19,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);
@ -564,23 +564,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);
}
@ -594,7 +594,7 @@ RainLoopApp.prototype.bootstart = function ()
Utils.removeSettingsViewModel(SettingsSocialScreen);
}
if (!this.settingsGet('AllowThemes'))
if (!RL.settingsGet('AllowThemes'))
{
Utils.removeSettingsViewModel(SettingsThemes);
}
@ -625,7 +625,7 @@ RainLoopApp.prototype.bootstart = function ()
window.SimplePace.sleep();
}
if (!!this.settingsGet('Auth'))
if (!!RL.settingsGet('Auth'))
{
this.setTitle(Utils.i18n('TITLES/LOADING'));
@ -699,7 +699,7 @@ RainLoopApp.prototype.bootstart = function ()
}
else
{
sCustomLoginLink = Utils.pString(this.settingsGet('CustomLoginLink'));
sCustomLoginLink = Utils.pString(RL.settingsGet('CustomLoginLink'));
if (!sCustomLoginLink)
{
kn.hideLoading();

18
dev/Common/_End.js
View file

@ -8,16 +8,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) {

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.4.1",
"release": "513",
"release": "516",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "Gruntfile.js",

2
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -5183,7 +5183,7 @@ class Actions
private function setupInformation()
{
$aResult = array(
'hash' => \file_exists(APP_DATA_FOLDER_PATH.'HASH') ? @\file_get_contents(APP_DATA_FOLDER_PATH.'HASH') : '',
'hash' => \file_exists(APP_DATA_FOLDER_PATH.'HASH') ? \md5(@\file_get_contents(APP_DATA_FOLDER_PATH.'HASH')) : '',
'version-full' => APP_VERSION,
);

14
rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
View file

@ -143,12 +143,18 @@ class Service
$aData = $this->startUpData($bAdmin);
$sAppHash = '';
if (\file_exists(APP_DATA_FOLDER_PATH.'HASH'))
{
$sAppHash = md5(@\file_get_contents(APP_DATA_FOLDER_PATH.'HASH'));
}
$bCacheEnabled = $this->oActions->Config()->Get('labs', 'cache_system_data', true);
$sCacheFileName = '';
if ($bCacheEnabled)
{
$sCacheFileName = 'TMPL:'.$aData['Hash'];
$sCacheFileName = 'TMPL:'.$aData['Hash'].'/'.$sAppHash;
$sResult = $this->oActions->Cacher()->Get($sCacheFileName);
}
@ -178,12 +184,6 @@ class Service
$bCached = true;
}
$sAppHash = '';
if (\file_exists(APP_DATA_FOLDER_PATH.'HASH'))
{
$sAppHash = @\file_get_contents(APP_DATA_FOLDER_PATH.'HASH');
}
$sResult .= '<!--';
$sResult .= ' [version:'.APP_VERSION;
$sResult .= '][time:'.substr(\microtime(true) - APP_START, 0, 6);

53
rainloop/v/0.0.0/static/js/admin.js
View file

@ -4787,20 +4787,6 @@ function AdminGeneral()
return Utils.convertLangName(this.mainLanguage());
}, this);
this.languagesOptions = ko.computed(function () {
return _.map(oData.languages(), function (sLanguage) {
var
sName = Utils.convertLangName(sLanguage),
sEn = Utils.convertLangName(sLanguage, true)
;
return {
'optValue': sLanguage,
'optText': sName + (sEn !== sName ? ' (' + sEn + ')' : '')
};
});
});
this.contactsSupported = RL.settingsGet('ContactsIsSupported');
this.contactsIsAllowed = RL.settingsGet('ContactsIsAllowed');
this.weakPassword = !!RL.settingsGet('WeakPassword');
@ -6498,15 +6484,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);
};
/**
@ -6516,8 +6499,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;
@ -6781,7 +6764,7 @@ AdminApp.prototype.bootstart = function ()
kn.hideLoading();
if (!this.settingsGet('AllowAdminPanel'))
if (!RL.settingsGet('AllowAdminPanel'))
{
kn.routeOff();
kn.setHash(RL.link().root(), true);
@ -6793,10 +6776,10 @@ AdminApp.prototype.bootstart = function ()
}
else
{
if (!!this.settingsGet('Auth'))
if (!!RL.settingsGet('Auth'))
{
// TODO
// if (!this.settingsGet('AllowPackages') && AdminPackages)
// if (!RL.settingsGet('AllowPackages') && AdminPackages)
// {
// Utils.disableSettingsViewModel(AdminPackages);
// }
@ -6836,16 +6819,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) {

6
rainloop/v/0.0.0/static/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

55
rainloop/v/0.0.0/static/js/app.js
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) {

4
rainloop/v/0.0.0/static/js/app.min.js vendored
View file

File diff suppressed because one or more lines are too long