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

Small fixes and improvements

Browse source
This commit is contained in:
RainLoop Team 2018-07-10 00:05:02 +03:00
parent f5b92b8b65
commit 791f0ff6ad
9 changed files with 6100 additions and 6350 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dev/Common/Booter.js
View file

@ -225,7 +225,7 @@ function runApp()
p.setOptions({theme: 'rainloop'});
p.start().set(5);
const libs = jassl(appData.StaticLibJsLink).then(() => {
const libs = () => jassl(appData.StaticLibJsLink).then(() => {
if (window.$)
{
window.$('#rl-check').remove();
@ -243,12 +243,14 @@ function runApp()
}
});
const common = window.Promise.all([
jassl(appData.TemplatesLink),
jassl(appData.LangLink)
]);
window.Promise.all([libs, common])
libs()
.then(() => {
p.set(20);
return window.Promise.all([
jassl(appData.TemplatesLink),
jassl(appData.LangLink)
]);
})
.then(() => {
p.set(30);
return jassl(useJsNextBundle ? appData.StaticAppJsNextLink : appData.StaticAppJsLink);

4
dev/External/ko.js vendored
View file

@ -1209,7 +1209,7 @@ ko.observable.fn.validateEmail = function() {
this.hasError = ko.observable(false);
this.subscribe((value) => {
this.hasError('' !== value && !(/^[^@\s]+@[^@\s]+$/.test(value)));
this.hasError('' !== value && !((/^[^@\s]+@[^@\s]+$/).test(value)));
});
this.valueHasMutated();
@ -1221,7 +1221,7 @@ ko.observable.fn.validateSimpleEmail = function() {
this.hasError = ko.observable(false);
this.subscribe((value) => {
this.hasError('' !== value && !(/^.+@.+$/.test(value)));
this.hasError('' !== value && !((/^.+@.+$/).test(value)));
});
this.valueHasMutated();

2
dev/View/Popup/AddOpenPgpKey.js
View file

@ -38,7 +38,7 @@ class AddOpenPgpKeyPopupView extends AbstractViewNext
let keyTrimmed = trim(this.key());
if (/[\n]/.test(keyTrimmed))
if ((/[\n]/).test(keyTrimmed))
{
keyTrimmed = keyTrimmed.replace(/[\r]+/g, '').replace(/[\n]{2,}/g, '\n\n');
}

2
dev/View/Popup/Contacts.js
View file

@ -327,7 +327,7 @@ class ContactsPopupView extends AbstractViewNext
properties = [];
_.each(this.viewProperties(), (oItem) => {
if (oItem.type() && '' !== trim(oItem.value()))
if (oItem.type() && oItem.type() !== ContactPropertyType.FullName && '' !== trim(oItem.value()))
{
properties.push([oItem.type(), oItem.value(), oItem.typeStr()]);
}

2
dev/View/User/MailBox/MessageList.js
View file

@ -465,7 +465,7 @@ class MessageListMailBoxUserView extends AbstractViewNext
return false;
}
if (/is:unseen/.test(this.mainMessageListSearch()))
if ((/is:unseen/).test(this.mainMessageListSearch()))
{
return false;
}