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

Synchronize localizations from Transifex

Browse source 
Update package.json dependencies
Fix eslint errors
webpack 2 -> webpack 3
This commit is contained in:
RainLoop Team 2017-06-24 22:26:27 +03:00
parent 36dbe0defd
commit 8da988fef2
34 changed files with 888 additions and 757 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -776,14 +776,14 @@ class ComposePopupView extends AbstractViewNext
{
if (!this.oEditor && this.composeEditorArea())
{
// _.delay(() => {
// _.delay(() => {
this.oEditor = new HtmlEditor(this.composeEditorArea(), null, () => {
fOnInit(this.oEditor);
this.resizerTrigger();
}, (bHtml) => {
this.isHtml(!!bHtml);
});
// }, 1000);
// }, 1000);
}
else if (this.oEditor)
{
@ -996,9 +996,8 @@ class ComposePopupView extends AbstractViewNext
oMessageOrArray = oMessageOrArray || null;
if (oMessageOrArray && isNormal(oMessageOrArray))
{
message = isArray(oMessageOrArray) &&
1 === oMessageOrArray.length ? oMessageOrArray[0] :
(!isArray(oMessageOrArray) ? oMessageOrArray : null);
message = isArray(oMessageOrArray) && 1 === oMessageOrArray.length ? oMessageOrArray[0] :
(!isArray(oMessageOrArray) ? oMessageOrArray : null);
}
this.oLastMessage = message;