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

26
dev/App/Abstract.js
View file

@ -91,15 +91,15 @@ class AbstractApp extends AbstractBoot
}
}, Magics.Time50ms));
// DEBUG
// Events.sub({
// 'window.resize': function() {
// window.console.log('window.resize');
// },
// 'window.resize.real': function() {
// window.console.log('window.resize.real');
// }
// });
// DEBUG
// Events.sub({
// 'window.resize': function() {
// window.console.log('window.resize');
// },
// 'window.resize.real': function() {
// window.console.log('window.resize.real');
// }
// });
$doc.on('keydown', (event) => {
if (event && event.ctrlKey)
@ -172,7 +172,7 @@ class AbstractApp extends AbstractBoot
else
{
this.iframe.attr('src', link);
// window.document.location.href = link;
// window.document.location.href = link;
}
return true;
@ -313,7 +313,7 @@ class AbstractApp extends AbstractBoot
ko.components.register('Date', require('Component/Date').default);
ko.components.register('x-script', require('Component/Script').default);
// ko.components.register('svg-icon', require('Component/SvgIcon').default);
// ko.components.register('svg-icon', require('Component/SvgIcon').default);
if (Settings.appSettingsGet('materialDesign') && bAnimationSupported)
{
@ -322,8 +322,8 @@ class AbstractApp extends AbstractBoot
}
else
{
// ko.components.register('Checkbox', require('Component/Classic/Checkbox').default);
// ko.components.register('CheckboxSimple', require('Component/Classic/Checkbox').default);
// ko.components.register('Checkbox', require('Component/Classic/Checkbox').default);
// ko.components.register('CheckboxSimple', require('Component/Classic/Checkbox').default);
ko.components.register('Checkbox', require('Component/Checkbox').default);
ko.components.register('CheckboxSimple', require('Component/Checkbox').default);
}

109
dev/App/User.js
View file

@ -192,31 +192,37 @@ class AppUser extends AbstractApp
}
MessageStore.messageListLoading(true);
Remote.messageList((sResult, oData, bCached) => {
Remote.messageList(
(sResult, oData, bCached) => {
if (StorageResultType.Success === sResult && oData && oData.Result)
{
MessageStore.messageListError('');
MessageStore.messageListLoading(false);
if (StorageResultType.Success === sResult && oData && oData.Result)
{
MessageStore.messageListError('');
MessageStore.messageListLoading(false);
MessageStore.setMessageList(oData, bCached);
}
else if (StorageResultType.Unload === sResult)
{
MessageStore.messageListError('');
MessageStore.messageListLoading(false);
}
else if (StorageResultType.Abort !== sResult)
{
MessageStore.messageList([]);
MessageStore.messageListLoading(false);
MessageStore.messageListError(oData && oData.ErrorCode ?
getNotification(oData.ErrorCode) : i18n('NOTIFICATIONS/CANT_GET_MESSAGE_LIST')
);
}
MessageStore.setMessageList(oData, bCached);
}
else if (StorageResultType.Unload === sResult)
{
MessageStore.messageListError('');
MessageStore.messageListLoading(false);
}
else if (StorageResultType.Abort !== sResult)
{
MessageStore.messageList([]);
MessageStore.messageListLoading(false);
MessageStore.messageListError(oData && oData.ErrorCode ?
getNotification(oData.ErrorCode) : i18n('NOTIFICATIONS/CANT_GET_MESSAGE_LIST')
);
}
}, FolderStore.currentFolderFullNameRaw(), iOffset, SettingsStore.messagesPerPage(),
MessageStore.messageListSearch(), MessageStore.messageListThreadUid());
},
FolderStore.currentFolderFullNameRaw(),
iOffset,
SettingsStore.messagesPerPage(),
MessageStore.messageListSearch(),
MessageStore.messageListThreadUid()
);
}
recacheInboxMessageList() {
@ -524,32 +530,32 @@ class AppUser extends AbstractApp
accountsCounts() {
return false;
// AccountStore.accounts.loading(true);
//
// Remote.accountsCounts((sResult, oData) => {
//
// AccountStore.accounts.loading(false);
//
// if (StorageResultType.Success === sResult && oData.Result && oData.Result['Counts'])
// {
// var
// sEmail = AccountStore.email(),
// aAcounts = AccountStore.accounts()
// ;
//
// _.each(oData.Result['Counts'], (oItem) => {
//
// var oAccount = _.find(aAcounts, (oAccount) => {
// return oAccount && oItem[0] === oAccount.email && sEmail !== oAccount.email;
// });
//
// if (oAccount)
// {
// oAccount.count(pInt(oItem[1]));
// }
// });
// }
// });
// AccountStore.accounts.loading(true);
//
// Remote.accountsCounts((sResult, oData) => {
//
// AccountStore.accounts.loading(false);
//
// if (StorageResultType.Success === sResult && oData.Result && oData.Result['Counts'])
// {
// var
// sEmail = AccountStore.email(),
// aAcounts = AccountStore.accounts()
// ;
//
// _.each(oData.Result['Counts'], (oItem) => {
//
// var oAccount = _.find(aAcounts, (oAccount) => {
// return oAccount && oItem[0] === oAccount.email && sEmail !== oAccount.email;
// });
//
// if (oAccount)
// {
// oAccount.count(pInt(oItem[1]));
// }
// });
// }
// });
}
accountsAndIdentities(bBoot) {
@ -1299,7 +1305,7 @@ class AppUser extends AbstractApp
{
this.setWindowTitle(i18n('TITLES/LOADING'));
// require.ensure([], function() { // require code splitting
// require.ensure([], function() { // require code splitting
this.foldersReload((value) => {
@ -1362,7 +1368,7 @@ class AppUser extends AbstractApp
startScreens([
MailBoxUserScreen,
Settings.capa(Capa.Settings) ? SettingsUserScreen : null
// false ? AboutUserScreen : null
// false ? AboutUserScreen : null
]);
if (allowGoogle || allowFacebook || allowTwitter)
@ -1444,8 +1450,7 @@ class AppUser extends AbstractApp
}
});
// }); // require code splitting
// }); // require code splitting
}
}
else