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

es5 -> es2015 (last stage)

Browse source 
Signature plugin fixes
Add view decorator
A large number of fixes
This commit is contained in:
RainLoop Team 2016-08-17 01:01:20 +03:00
parent e88c193334
commit 17669b7be0
153 changed files with 21193 additions and 21115 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dev/Screen/User/About.js
View file

@ -1,17 +1,18 @@
import {AbstractScreen} from 'Knoin/AbstractScreen';
import App from 'App/User';
import {AboutUserView} from 'View/User/About';
import {getApp} from 'Helper/Apps/User';
class AboutUserScreen extends AbstractScreen
{
constructor() {
super('about', [
require('View/User/About')
]);
super('about', [AboutUserView]);
}
onShow() {
App.setWindowTitle('RainLoop');
getApp().setWindowTitle('RainLoop');
}
}

11
dev/Screen/User/Login.js
View file

@ -1,17 +1,18 @@
import {AbstractScreen} from 'Knoin/AbstractScreen';
import App from 'App/User';
import {LoginUserView} from 'View/User/Login';
import {getApp} from 'Helper/Apps/User';
class LoginUserScreen extends AbstractScreen
{
constructor() {
super('login', [
require('View/User/Login')
]);
super('login', [LoginUserView]);
}
onShow() {
App.setWindowTitle('');
getApp().setWindowTitle('');
}
}

32
dev/Screen/User/MailBox.js
View file

@ -16,17 +16,25 @@ import SettingsStore from 'Stores/User/Settings';
import FolderStore from 'Stores/User/Folder';
import MessageStore from 'Stores/User/Message';
import {SystemDropDownMailBoxUserView} from 'View/User/MailBox/SystemDropDown';
import {FolderListMailBoxUserView} from 'View/User/MailBox/FolderList';
import {MessageListMailBoxUserView} from 'View/User/MailBox/MessageList';
import {MessageViewMailBoxUserView} from 'View/User/MailBox/MessageView';
import {getApp} from 'Helper/Apps/User';
import {warmUpScreenPopup} from 'Knoin/Knoin';
import {AbstractScreen} from 'Knoin/AbstractScreen';
import App from 'App/User';
class MailBoxUserScreen extends AbstractScreen
{
constructor() {
super('mailbox', [
require('View/User/MailBox/SystemDropDown'),
require('View/User/MailBox/FolderList'),
require('View/User/MailBox/MessageList'),
require('View/User/MailBox/MessageView')
SystemDropDownMailBoxUserView,
FolderListMailBoxUserView,
MessageListMailBoxUserView,
MessageViewMailBoxUserView
]);
}
@ -42,7 +50,7 @@ class MailBoxUserScreen extends AbstractScreen
foldersInboxUnreadCount = 0;
}
App.setWindowTitle(('' === email ? '' : '' + (0 < foldersInboxUnreadCount ? '(' + foldersInboxUnreadCount + ') ' : ' ') + email + ' - ') + i18n('TITLES/MAILBOX'));
getApp().setWindowTitle(('' === email ? '' : '' + (0 < foldersInboxUnreadCount ? '(' + foldersInboxUnreadCount + ') ' : ' ') + email + ' - ') + i18n('TITLES/MAILBOX'));
}
/**
@ -73,6 +81,7 @@ class MailBoxUserScreen extends AbstractScreen
* @param {string} folderHash
* @param {number} page
* @param {string} search
* @returns {void}
*/
onRoute(folderHash, page, search) {
let threadUid = folderHash.replace(/^(.+)~([\d]+)$/, '$2');
@ -91,7 +100,7 @@ class MailBoxUserScreen extends AbstractScreen
MessageStore.messageListSearch(search);
MessageStore.messageListThreadUid(threadUid);
App.reloadMessageList();
getApp().reloadMessageList();
}
}
@ -104,9 +113,8 @@ class MailBoxUserScreen extends AbstractScreen
MessageStore.messageList.subscribe(windowResizeCallback);
MessageStore.message.subscribe(windowResizeCallback);
_.delay(() => {
SettingsStore.layout.valueHasMutated();
}, Magics.Time50ms);
_.delay(() => SettingsStore.layout.valueHasMutated(), Magics.Time50ms);
_.delay(() => warmUpScreenPopup(require('View/Popup/Compose')), Magics.Time500ms);
Events.sub('mailbox.inbox-unread-count', (count) => {
FolderStore.foldersInboxUnreadCount(count);
@ -130,7 +138,7 @@ class MailBoxUserScreen extends AbstractScreen
if (!bMobileDevice && !Settings.appSettingsGet('mobile'))
{
_.defer(() => {
App.initHorizontalLayoutResizer(ClientSideKeyName.MessageListSize);
getApp().initHorizontalLayoutResizer(ClientSideKeyName.MessageListSize);
});
}
}
@ -139,7 +147,7 @@ class MailBoxUserScreen extends AbstractScreen
* @returns {Array}
*/
routes() {
var
const
inboxFolderName = getFolderInboxName(),
fNormS = (request, vals) => {
vals[0] = pString(vals[0]);

15
dev/Screen/User/Settings.js
View file

@ -11,7 +11,6 @@ import * as Settings from 'Storage/Settings';
import {addSettingsViewModel} from 'Knoin/Knoin';
import {AbstractSettingsScreen} from 'Screen/AbstractSettings';
import App from 'App/User';
import {GeneralUserSettings} from 'Settings/User/General';
import {ContactsUserSettings} from 'Settings/User/Contacts';
@ -25,13 +24,19 @@ import {FoldersUserSettings} from 'Settings/User/Folders';
import {ThemesUserSettings} from 'Settings/User/Themes';
import {OpenPgpUserSettings} from 'Settings/User/OpenPgp';
import {SystemDropDownSettingsUserView} from 'View/User/Settings/SystemDropDown';
import {MenuSettingsUserView} from 'View/User/Settings/Menu';
import {PaneSettingsUserView} from 'View/User/Settings/Pane';
import {getApp} from 'Helper/Apps/User';
class SettingsUserScreen extends AbstractSettingsScreen
{
constructor() {
super([
require('View/User/Settings/SystemDropDown'),
require('View/User/Settings/Menu'),
require('View/User/Settings/Pane')
SystemDropDownSettingsUserView,
MenuSettingsUserView,
PaneSettingsUserView
]);
initOnStartOrLangChange(() => {
@ -144,7 +149,7 @@ class SettingsUserScreen extends AbstractSettingsScreen
setSettingsTitle() {
const sEmail = AccountStore.email();
App.setWindowTitle(('' === sEmail ? '' : sEmail + ' - ') + this.sSettingsTitle);
getApp().setWindowTitle(('' === sEmail ? '' : sEmail + ' - ') + this.sSettingsTitle);
}
}