Remove Common/Enums Magics.*

This commit is contained in:
djmaze 2020-08-13 22:58:41 +02:00
parent 382aef7ebb
commit 6541a1de7c
38 changed files with 135 additions and 219 deletions

View file

@ -4,7 +4,7 @@ import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import MessageStore from 'Stores/User/Message';
import { Capa, Magics, KeyState } from 'Common/Enums';
import { Capa, KeyState } from 'Common/Enums';
import { settings } from 'Common/Links';
import * as Events from 'Common/Events';
@ -51,7 +51,7 @@ class AbstractSystemDropDownUserView extends AbstractViewNext {
accountClick(account, event) {
if (account && event && undefined !== event.which && 1 === event.which) {
AccountStore.accounts.loading(true);
setTimeout(() => AccountStore.accounts.loading(false), Magics.Time1s);
setTimeout(() => AccountStore.accounts.loading(false), 1000);
}
return true;

View file

@ -5,7 +5,6 @@ import {
LoginSignMeTypeAsString,
ClientSideKeyName,
StorageResultType,
Magics,
Notification
} from 'Common/Enums';
@ -216,7 +215,7 @@ class LoginUserView extends AbstractViewNext {
this.additionalCode.visibility(true);
this.submitRequest(false);
setTimeout(() => this.additionalCode.focused(true), Magics.Time100ms);
setTimeout(() => this.additionalCode.focused(true), 100);
} else if (oData.Admin) {
getApp().redirectToAdminPanel();
} else {
@ -330,7 +329,7 @@ class LoginUserView extends AbstractViewNext {
}
);
});
}, Magics.Time50ms);
}, 50);
triggerAutocompleteInputChange(true);
}
@ -347,7 +346,7 @@ class LoginUserView extends AbstractViewNext {
if (!bShift) {
setTimeout(() => {
this.emailFocus(true);
}, Magics.Time50ms);
}, 50);
return false;
}

View file

@ -1,7 +1,7 @@
import ko from 'ko';
import { isNormal, windowResize } from 'Common/Utils';
import { Capa, Focused, Layout, KeyState, EventKeyCode, Magics } from 'Common/Enums';
import { Capa, Focused, Layout, KeyState, EventKeyCode } from 'Common/Enums';
import { $htmlCL, leftPanelDisabled, moveAction } from 'Common/Globals';
import { mailBox, settings } from 'Common/Links';
import { setFolderHash } from 'Common/Cache';
@ -199,7 +199,7 @@ class FolderListMailBoxUserView extends AbstractViewNext {
folder.collapsed(false);
getApp().setExpandedFolder(folder.fullNameHash, true);
windowResize();
}, Magics.Time500ms);
}, 500);
}
}

View file

@ -6,7 +6,6 @@ import {
Focused,
ComposeType,
FolderType,
Magics,
MessageSetAction,
KeyState,
StorageResultType
@ -434,7 +433,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
this.selector.unselect();
this.gotoPage(up ? prev : next);
}
}, Magics.Time350ms);
}, 350);
return true;
}
@ -775,11 +774,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
this.initShortcuts();
if (!bMobileDevice && ifvisible && Settings.capa(Capa.Prefetch)) {
ifvisible.setIdleDuration(Magics.ifvisibleIdle10s);
ifvisible.idle(() => {
this.prefetchNextTick();
});
ifvisible.idle(this.prefetchNextTick.bind(this));
}
}
@ -949,7 +944,7 @@ class MessageListMailBoxUserView extends AbstractViewNext {
if (next) {
this.prefetchNextTick();
}
}, Magics.Time1s);
}, 1000);
},
message.folderFullNameRaw,
message.uid

View file

@ -10,7 +10,6 @@ import {
FolderType,
Focused,
Layout,
Magics,
MessageSetAction
} from 'Common/Enums';
@ -259,7 +258,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
if (Local.get(ClientSideKeyName.MessageAttachmnetControls)) {
setTimeout(() => {
this.showAttachmnetControls(true);
}, Magics.Time50ms);
}, 50);
}
if (this.viewHash !== message.hash) {
@ -433,8 +432,8 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
this.viewBodyTopValue(
this.message()
? this.oHeaderDom.height() +
Magics.Size20px /* padding-(top/bottom): 20px */ +
Magics.Size1px /* borded-bottom: 1px */
20 /* padding-(top/bottom): 20px */ +
1 /* borded-bottom: 1px */
: 0
);
}
@ -545,17 +544,17 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
if (!t) {
t = setTimeout(()=>{
setTimeout(fCheckHeaderHeight, 1);
setTimeout(fCheckHeaderHeight, Magics.Time200ms);
setTimeout(fCheckHeaderHeight, Magics.Time500ms);
setTimeout(fCheckHeaderHeight, 200);
setTimeout(fCheckHeaderHeight, 500);
t = 0;
}, Magics.Time50ms);
}, 50);
}
}
);
this.showFullInfo.subscribe((value) => {
windowResize();
windowResize(Magics.Time200ms);
windowResize(200);
Local.set(ClientSideKeyName.MessageHeaderFullInfo, value ? '1' : '0');
});
@ -574,7 +573,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
// setup maito protocol
return !(
!!event &&
Magics.EventWhichMouseMiddle !== event.which &&
3 !== event.which &&
mailToHelper(
jQuery(this).attr('href'),
Settings.capa(Capa.Composer) ? require('View/Popup/Compose') : null // eslint-disable-line no-invalid-this
@ -865,8 +864,8 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
scrollMessageToTop() {
if (this.oMessageScrollerDom) {
if (Magics.Size50px < this.oMessageScrollerDom.scrollTop) {
this.oMessageScrollerDom.scrollTop = Magics.Size50px;
if (50 < this.oMessageScrollerDom.scrollTop) {
this.oMessageScrollerDom.scrollTop = 50;
} else {
this.oMessageScrollerDom.scrollTop = 0;
}