Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source 
Release commit
This commit is contained in:
RainLoop Team 2014-09-30 00:01:31 +04:00
parent 9dbed6f929
commit 9be07dffd7
3 changed files with 34 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
dev/Common/Utils.js
View file

@ -5,7 +5,7 @@
var var
oEncryptObject = null, oEncryptObject = null,
Utils = {}, Utils = {},
window = require('window'), window = require('window'),
@ -204,12 +204,12 @@
{ {
var var
sResultValue = false, sResultValue = false,
oEncrypt = Utils.rsaObject(sPublicKey); oEncrypt = Utils.rsaObject(sPublicKey)
; ;
if (oEncrypt) if (oEncrypt)
{ {
sResultValue = oEncrypt.encrypt(Utils.fakeMd5() + ':' + sValue + ':' + Utils.fakeMd5()) sResultValue = oEncrypt.encrypt(Utils.fakeMd5() + ':' + sValue + ':' + Utils.fakeMd5());
if (false !== sResultValue && Utils.isNormal(sResultValue)) if (false !== sResultValue && Utils.isNormal(sResultValue))
{ {
return 'rsa:xxx:' + sResultValue; return 'rsa:xxx:' + sResultValue;
@ -1186,6 +1186,14 @@
return (new Date()).getTime(); return (new Date()).getTime();
}; };
/**
* @return {number}
*/
Utils.timestamp = function ()
{
return window.Math.round(Utils.microtime() / 1000);
};
/** /**
* *
* @param {string} sLanguage * @param {string} sLanguage
@ -1932,24 +1940,25 @@
* @param {string} sLanguage * @param {string} sLanguage
* @param {Function=} fDone * @param {Function=} fDone
* @param {Function=} fFail * @param {Function=} fFail
* @param {Function=} fAllways
*/ */
Utils.reloadLanguage = function (sLanguage, fDone, fFail, fAllways) Utils.reloadLanguage = function (sLanguage, fDone, fFail)
{ {
var iStart = Utils.microtime();
$.ajax({ $.ajax({
'url': require('Common/LinkBuilder').langLink(sLanguage), 'url': require('Common/LinkBuilder').langLink(sLanguage),
'dataType': 'script', 'dataType': 'script',
'cache': true 'cache': true
}) })
.done(function () {
Utils.i18nReload();
(fDone || Utils.emptyFunction)();
})
.fail(fFail || Utils.emptyFunction) .fail(fFail || Utils.emptyFunction)
.always(fAllways || Utils.emptyFunction) .done(function () {
_.delay(function () {
Utils.i18nReload();
(fDone || Utils.emptyFunction)();
}, 500 < Utils.microtime() - iStart ? 1 : 500);
})
; ;
}; };
/** /**
* @param {Object} oParams * @param {Object} oParams
*/ */
@ -1959,7 +1968,7 @@
_.each(oParams, function (sKey, sValue) { _.each(oParams, function (sKey, sValue) {
aContent.push('' + sKey + '=' + sValue); aContent.push('' + sKey + '=' + sValue);
}); });
$('#rl-head-viewport').attr('content', aContent.join(', ')); $('#rl-head-viewport').attr('content', aContent.join(', '));
}; };

22
dev/Settings/App/General.js
View file

@ -67,22 +67,24 @@
_.delay(function () { _.delay(function () {
var var
f1 = Utils.settingsSaveHelperSimpleFunction(self.mppTrigger, self) f1 = Utils.settingsSaveHelperSimpleFunction(self.mppTrigger, self),
fReloadLanguageHelper = function (iSaveSettingsStep) {
return function() {
self.languageTrigger(iSaveSettingsStep);
_.delay(function () {
self.languageTrigger(Enums.SaveSettingsStep.Idle);
}, 1000);
};
}
; ;
Data.language.subscribe(function (sValue) { Data.language.subscribe(function (sValue) {
self.languageTrigger(Enums.SaveSettingsStep.Animate); self.languageTrigger(Enums.SaveSettingsStep.Animate);
Utils.reloadLanguage(sValue, function() { Utils.reloadLanguage(sValue,
self.languageTrigger(Enums.SaveSettingsStep.TrueResult); fReloadLanguageHelper(Enums.SaveSettingsStep.TrueResult),
}, function() { fReloadLanguageHelper(Enums.SaveSettingsStep.FalseResult));
self.languageTrigger(Enums.SaveSettingsStep.FalseResult);
}, function() {
_.delay(function () {
self.languageTrigger(Enums.SaveSettingsStep.Idle);
}, 1000);
});
Remote.saveSettings(null, { Remote.saveSettings(null, {
'Language': sValue 'Language': sValue

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop", "name": "RainLoop",
"title": "RainLoop Webmail", "title": "RainLoop Webmail",
"version": "1.6.9", "version": "1.6.9",
"release": "167", "release": "169",
"description": "Simple, modern & fast web-based email client", "description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net", "homepage": "http://rainloop.net",
"main": "gulpfile.js", "main": "gulpfile.js",