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

Weekly fixes

Browse source
This commit is contained in:
RainLoop Team 2015-03-04 01:15:17 +04:00
parent 053fd1c60b
commit f1b3271b4d
16 changed files with 210 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/App/User.js
View file

@ -1042,6 +1042,7 @@
oData.Result.IsThreadsSupported && true);
FolderStore.folderList(this.folderResponseParseRec(FolderStore.namespace, oData.Result['@Collection']));
FolderStore.folderList.optimized(!!oData.Result.Optimized);
if (oData.Result['SystemFolders'] && '' === '' +
Settings.settingsGet('SentFolder') +

4
dev/Common/Selector.js
View file

@ -687,7 +687,7 @@
if (oEvent)
{
if (oEvent.shiftKey && !oEvent.ctrlKey && !oEvent.altKey)
if (oEvent.shiftKey && !(oEvent.ctrlKey || oEvent.metaKey) && !oEvent.altKey)
{
bClick = false;
if ('' === this.sLastUid)
@ -700,7 +700,7 @@
this.focusedItem(oItem);
}
else if (oEvent.ctrlKey && !oEvent.shiftKey && !oEvent.altKey)
else if ((oEvent.ctrlKey || oEvent.metaKey) && !oEvent.shiftKey && !oEvent.altKey)
{
bClick = false;
this.focusedItem(oItem);

4
dev/Model/ComposeAttachment.js
View file

@ -48,12 +48,12 @@
this.progressText = ko.computed(function () {
var iP = this.progress();
return 0 === iP ? '' : '' + (99 === iP ? 100 : iP) + '%';
return 0 === iP ? '' : '' + (98 < iP ? 100 : iP) + '%';
}, this);
this.progressStyle = ko.computed(function () {
var iP = this.progress();
return 0 === iP ? '' : 'width:' + (99 === iP ? 100 : iP) + '%';
return 0 === iP ? '' : 'width:' + (98 < iP ? 100 : iP) + '%';
}, this);
this.title = ko.computed(function () {

42
dev/View/User/Login.js
View file

@ -22,7 +22,7 @@
Local = require('Storage/Client'),
Settings = require('Storage/Settings'),
Remote = require('Remote/User/Ajax'),
kn = require('Knoin/Knoin'),
@ -58,6 +58,7 @@
this.passwordError = ko.observable(false);
this.emailFocus = ko.observable(false);
this.passwordFocus = ko.observable(false);
this.submitFocus = ko.observable(false);
this.email.subscribe(function () {
@ -297,29 +298,38 @@
LoginUserView.prototype.onShow = function ()
{
kn.routeOff();
};
_.delay(_.bind(function () {
if ('' !== this.email() && '' !== this.password())
{
this.submitFocus(true);
}
else
{
this.emailFocus(true);
}
LoginUserView.prototype.onShowWithDelay = function ()
{
if ('' !== this.email() && '' !== this.password())
{
this.submitFocus(true);
}
else if ('' === this.email())
{
this.emailFocus(true);
}
else if ('' === this.password())
{
this.passwordFocus(true);
}
else
{
this.emailFocus(true);
}
if (Settings.settingsGet('UserLanguage'))
{
$.cookie('rllang', LanguageStore.language(), {'expires': 30});
}
}, this), 100);
if (Settings.settingsGet('UserLanguage'))
{
$.cookie('rllang', LanguageStore.language(), {'expires': 30});
}
};
LoginUserView.prototype.onHide = function ()
{
this.submitFocus(false);
this.emailFocus(false);
this.passwordFocus(false);
};
LoginUserView.prototype.onBuild = function ()

4
dev/View/User/MailBox/MessageView.js
View file

@ -279,8 +279,8 @@
this.viewIsImportant(oMessage.isImportant());
sLastEmail = oMessage.fromAsSingleEmail();
Cache.getUserPic(sLastEmail, function (sPic, $sEmail) {
if (sPic !== self.viewUserPic() && sLastEmail === $sEmail)
Cache.getUserPic(sLastEmail, function (sPic, sEmail) {
if (sPic !== self.viewUserPic() && sLastEmail === sEmail)
{
self.viewUserPicVisible(false);
self.viewUserPic(Consts.DataImages.UserDotPic);