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

-1…*.indexOf() to native .includes()

Browse source
This commit is contained in:
djmaze 2020-07-20 21:39:00 +02:00
parent eb15c6e45f
commit 961fa305c9
8 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/View/Popup/Compose.js
View file

@ -739,7 +739,7 @@ class ComposePopupView extends AbstractViewNext {
if ('' !== fromLine) {
signature = signature.replace(/{{FROM-FULL}}/g, fromLine);
if (-1 === fromLine.indexOf(' ') && 0 < fromLine.indexOf('@')) {
if (!fromLine.includes(' ') && 0 < fromLine.indexOf('@')) {
fromLine = fromLine.replace(/@[\S]+/, '');
}
@ -752,14 +752,14 @@ class ComposePopupView extends AbstractViewNext {
signature = signature.replace(/{{FROM}}/g, '');
signature = signature.replace(/{{FROM-FULL}}/g, '');
if (-1 < signature.indexOf('{{DATE}}')) {
if (signature.includes('{{DATE}}')) {
signature = signature.replace(/{{DATE}}/g, momentorFormat(0, 'llll'));
}
if (-1 < signature.indexOf('{{TIME}}')) {
if (signature.includes('{{TIME}}')) {
signature = signature.replace(/{{TIME}}/g, momentorFormat(0, 'LT'));
}
if (-1 < signature.indexOf('{{MOMENT:')) {
if (signature.includes('{{MOMENT:')) {
try {
let match = null;
while (null !== (match = momentRegx.exec(signature))) {