Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39:20 +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;

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

@ -216,7 +216,7 @@ class ContactsPopupView extends AbstractViewNext
this.viewHash = ko.computed(() => '' + _.map(this.viewProperties(), (oItem) => oItem.value()).join(''));
// this.saveCommandDebounce = _.debounce(_.bind(this.saveCommand, this), 1000);
// this.saveCommandDebounce = _.debounce(_.bind(this.saveCommand, this), 1000);
this.viewHash.subscribe(() => {
if (this.watchHash() && !this.viewReadOnly() && !this.watchDirty())

4
dev/View/Popup/Filter.js
View file

@ -84,8 +84,8 @@ class FilterPopupView extends AbstractViewNext
populateOptions() {
this.actionTypeOptions([]);
// this.actionTypeOptions.push({'id': FiltersAction.None,
// 'name': i18n('POPUPS_FILTER/SELECT_ACTION_NONE')});
// this.actionTypeOptions.push({'id': FiltersAction.None,
// 'name': i18n('POPUPS_FILTER/SELECT_ACTION_NONE')});
const modules = this.modules();
if (modules)

37
dev/View/Popup/FolderSystem.js
View file

@ -48,23 +48,26 @@ class FolderSystemPopupView extends AbstractViewNext
const
fSetSystemFolders = () => {
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
},
fSaveSystemFolders = _.debounce(() => {
fSetSystemFolders();
Remote.saveSystemFolders(noop, {
SentFolder: FolderStore.sentFolder(),
DraftFolder: FolderStore.draftFolder(),
SpamFolder: FolderStore.spamFolder(),
TrashFolder: FolderStore.trashFolder(),
ArchiveFolder: FolderStore.archiveFolder(),
NullFolder: 'NullFolder'
});
}, Magics.Time1s),
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
},
fSaveSystemFolders = _.debounce(
() => {
fSetSystemFolders();
Remote.saveSystemFolders(noop, {
SentFolder: FolderStore.sentFolder(),
DraftFolder: FolderStore.draftFolder(),
SpamFolder: FolderStore.spamFolder(),
TrashFolder: FolderStore.trashFolder(),
ArchiveFolder: FolderStore.archiveFolder(),
NullFolder: 'NullFolder'
});
},
Magics.Time1s
),
fCallback = () => {
fSetSystemFolders();
fSaveSystemFolders();

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

@ -264,63 +264,68 @@ class LoginUserView extends AbstractViewNext
const
fLoginRequest = (sLoginPassword) => {
Remote.login((sResult, oData) => {
Remote.login(
(sResult, oData) => {
$win.trigger('rl.tooltips.diactivate');
$win.trigger('rl.tooltips.activate');
$win.trigger('rl.tooltips.diactivate');
$win.trigger('rl.tooltips.activate');
if (StorageResultType.Success === sResult && oData && 'Login' === oData.Action)
{
if (oData.Result)
if (StorageResultType.Success === sResult && oData && 'Login' === oData.Action)
{
if (oData.TwoFactorAuth)
if (oData.Result)
{
this.additionalCode('');
this.additionalCode.visibility(true);
this.submitRequest(false);
if (oData.TwoFactorAuth)
{
this.additionalCode('');
this.additionalCode.visibility(true);
this.submitRequest(false);
_.delay(() => this.additionalCode.focused(true), Magics.Time100ms);
_.delay(() => this.additionalCode.focused(true), Magics.Time100ms);
}
else if (oData.Admin)
{
getApp().redirectToAdminPanel();
}
else
{
getApp().loginAndLogoutReload(false);
}
}
else if (oData.Admin)
else if (oData.ErrorCode)
{
getApp().redirectToAdminPanel();
this.submitRequest(false);
if (-1 < inArray(oData.ErrorCode, [Notification.InvalidInputArgument]))
{
oData.ErrorCode = Notification.AuthError;
}
this.submitError(getNotificationFromResponse(oData));
if ('' === this.submitError())
{
this.submitError(getNotification(Notification.UnknownError));
}
else if (oData.ErrorMessageAdditional)
{
this.submitErrorAddidional(oData.ErrorMessageAdditional);
}
}
else
{
getApp().loginAndLogoutReload(false);
}
}
else if (oData.ErrorCode)
{
this.submitRequest(false);
if (-1 < inArray(oData.ErrorCode, [Notification.InvalidInputArgument]))
{
oData.ErrorCode = Notification.AuthError;
}
this.submitError(getNotificationFromResponse(oData));
if ('' === this.submitError())
{
this.submitError(getNotification(Notification.UnknownError));
}
else if (oData.ErrorMessageAdditional)
{
this.submitErrorAddidional(oData.ErrorMessageAdditional);
this.submitRequest(false);
}
}
else
{
this.submitRequest(false);
this.submitError(getNotification(Notification.UnknownError));
}
}
else
{
this.submitRequest(false);
this.submitError(getNotification(Notification.UnknownError));
}
}, this.email(), '', sLoginPassword, !!this.signMe(),
},
this.email(),
'',
sLoginPassword,
!!this.signMe(),
this.bSendLanguage ? this.language() : '',
this.additionalCode.visibility() ? this.additionalCode() : '',
this.additionalCode.visibility() ? !!this.additionalCodeSignMe() : false

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

@ -68,20 +68,27 @@ class MessageViewMailBoxUserView extends AbstractViewNext
let lastEmail = '';
const
createCommandReplyHelper = (type) => createCommand(() => {
this.lastReplyAction(type);
this.replyOrforward(type);
}, this.canBeRepliedOrForwarded),
createCommandReplyHelper = (type) => createCommand(
() => {
this.lastReplyAction(type);
this.replyOrforward(type);
},
this.canBeRepliedOrForwarded
);
createCommandActionHelper = (folderType, useFolder) => createCommand(() => {
const message = this.message();
if (message && this.allowMessageListActions)
{
this.message(null);
getApp().deleteMessagesFromFolder(
folderType, message.folderFullNameRaw, [message.uid], useFolder);
}
}, this.messageVisibility);
const
createCommandActionHelper = (folderType, useFolder) => createCommand(
() => {
const message = this.message();
if (message && this.allowMessageListActions)
{
this.message(null);
getApp().deleteMessagesFromFolder(
folderType, message.folderFullNameRaw, [message.uid], useFolder);
}
},
this.messageVisibility
);
this.oDom = null;
this.oHeaderDom = null;
@ -431,9 +438,9 @@ class MessageViewMailBoxUserView extends AbstractViewNext
const
fFindDom = function(inputDom) {
const children = inputDom ? inputDom.children() : null;
return (children && 1 === children.length && children.is('table,div,center')) ? children : null;
},
const children = inputDom ? inputDom.children() : null;
return (children && 1 === children.length && children.is('table,div,center')) ? children : null;
},
fFindColor = function(inputDom) {
let color = '';
if (inputDom)