Remove Common/Enums Magics.*

dev/View/Admin/Login.js

@@ -2,7 +2,7 @@ import ko from 'ko';
 
 import { triggerAutocompleteInputChange } from 'Common/Utils';
 
-import { StorageResultType, Notification, Magics } from 'Common/Enums';
+import { StorageResultType, Notification } from 'Common/Enums';
 import { getNotification } from 'Common/Translator';
 import { $win } from 'Common/Globals';
 
@@ -104,7 +104,7 @@ class LoginAdminView extends AbstractViewNext {
 
 		setTimeout(() => {
 			this.loginFocus(true);
-		}, Magics.Time100ms);
+		}, 100);
 	}
 
 	onHide() {

dev/View/Popup/Compose.js

@@ -2,7 +2,6 @@ import ko from 'ko';
 
 import {
 	Capa,
-	Magics,
 	KeyState,
 	ComposeType,
 	StorageResultType,
@@ -328,7 +327,7 @@ class ComposePopupView extends AbstractViewNext {
 		var d, fn = this.tryToClosePopup.bind(this);
 		this.tryToClosePopup = ()=>{
 			d && clearTimeout(d);
-			d = setTimeout(fn, Magics.Time200ms);
+			d = setTimeout(fn, 200);
 		};
 
 		this.emailsSource = this.emailsSource.bind(this);
@@ -506,7 +505,7 @@ class ComposePopupView extends AbstractViewNext {
 			this.skipCommand();
 			setTimeout(() => {
 				showScreenPopup(require('View/Popup/Contacts'), [true, this.sLastFocusedField]);
-			}, Magics.Time200ms);
+			}, 200);
 		}
 	}
 
@@ -528,7 +527,7 @@ class ComposePopupView extends AbstractViewNext {
 
 	autosaveStart() {
 		clearTimeout(this.iTimer);
-		this.iTimer = setTimeout(this.autosaveFunction, Magics.Time1m);
+		this.iTimer = setTimeout(this.autosaveFunction, 60000);
 	}
 
 	autosaveStop() {
@@ -1174,7 +1173,7 @@ class ComposePopupView extends AbstractViewNext {
 						this.oEditor.focus();
 					}
 				}
-			}, Magics.Time100ms);
+			}, 100);
 		}
 	}
 
@@ -1250,14 +1249,14 @@ class ComposePopupView extends AbstractViewNext {
 		Events.sub('window.resize.real', ()=>{
 			// debounce
 			d && clearTimeout(d);
-			d = setTimeout(o.resizerTrigger, Magics.Time50ms);
+			d = setTimeout(o.resizerTrigger, 50);
 		});
 
 		setInterval(() => {
 			if (this.modalVisibility() && this.oEditor) {
 				this.oEditor.resize();
 			}
-		}, Magics.Time5s);
+		}, 5000);
 	}
 
 	/**

dev/View/Popup/ComposeOpenPgp.js

@@ -2,7 +2,7 @@ import ko from 'ko';
 
 import { pString, defautOptionsAfterRender } from 'Common/Utils';
 
-import { Magics, KeyState } from 'Common/Enums';
+import { KeyState } from 'Common/Enums';
 import { i18n } from 'Common/Translator';
 
 import PgpStore from 'Stores/User/Pgp';
@@ -234,7 +234,7 @@ class ComposeOpenPgpPopupView extends AbstractViewNext {
 				}
 
 				this.submitRequest(false);
-			}, Magics.Time20ms);
+			}, 20);
 		} else {
 			this.submitRequest(false);
 		}

dev/View/Popup/Contacts.js

@@ -5,7 +5,6 @@ import {
 	ContactPropertyType,
 	ComposeType,
 	Capa,
-	Magics,
 	StorageResultType,
 	Notification,
 	KeyState
@@ -274,7 +273,7 @@ class ContactsPopupView extends AbstractViewNext {
 
 			setTimeout(() => {
 				showScreenPopup(require('View/Popup/Compose'), [ComposeType.Empty, null, toEmails, ccEmails, bccEmails]);
-			}, Magics.Time200ms);
+			}, 200);
 		}
 
 		return true;
@@ -325,14 +324,14 @@ class ContactsPopupView extends AbstractViewNext {
 
 				setTimeout(() => {
 					this.viewSaveTrigger(res ? SaveSettingsStep.TrueResult : SaveSettingsStep.FalseResult);
-				}, Magics.Time350ms);
+				}, 350);
 
 				if (res) {
 					this.watchDirty(false);
 
 					setTimeout(() => {
 						this.viewSaveTrigger(SaveSettingsStep.Idle);
-					}, Magics.Time1s);
+					}, 1000);
 				}
 			},
 			requestUid,
@@ -471,7 +470,7 @@ class ContactsPopupView extends AbstractViewNext {
 					koContacts.remove(contact);
 					delegateRunOnDestroy(contact);
 				});
-			}, Magics.Time500ms);
+			}, 500);
 		}
 	}
 
@@ -488,12 +487,12 @@ class ContactsPopupView extends AbstractViewNext {
 	 * @param {AjaxJsonDefaultResponse} oData
 	 */
 	deleteResponse(sResult, oData) {
-		if (Magics.Time500ms < (StorageResultType.Success === sResult && oData && oData.Time ? pInt(oData.Time) : 0)) {
+		if (500 < (StorageResultType.Success === sResult && oData && oData.Time ? pInt(oData.Time) : 0)) {
 			this.reloadContactList(this.bDropPageAfterDelete);
 		} else {
 			setTimeout(() => {
 				this.reloadContactList(this.bDropPageAfterDelete);
-			}, Magics.Time500ms);
+			}, 500);
 		}
 	}
 

dev/View/Popup/FolderSystem.js

@@ -1,6 +1,6 @@
 import ko from 'ko';
 
-import { SetSystemFoldersNotification, Magics } from 'Common/Enums';
+import { SetSystemFoldersNotification } from 'Common/Enums';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 import { folderListOptionsBuilder, defautOptionsAfterRender } from 'Common/Utils';
 import { initOnStartOrLangChange, i18n } from 'Common/Translator';
@@ -76,7 +76,7 @@ class FolderSystemPopupView extends AbstractViewNext {
 						ArchiveFolder: FolderStore.archiveFolder(),
 						NullFolder: 'NullFolder'
 					});
-				}, Magics.Time1s);
+				}, 1000);
 			},
 			fCallback = () => {
 				fSetSystemFolders();

dev/View/Popup/KeyboardShortcutsHelp.js

@@ -1,4 +1,4 @@
-import { KeyState, Magics } from 'Common/Enums';
+import { KeyState } from 'Common/Enums';
 
 import { popup } from 'Knoin/Knoin';
 import { AbstractViewNext } from 'Knoin/AbstractViewNext';
@@ -44,7 +44,7 @@ class KeyboardShortcutsHelpPopupView extends AbstractViewNext {
 						}
 
 						return true;
-					}, Magics.Time100ms);
+					}, 100);
 				}
 			}
 		);

dev/View/Popup/MessageOpenPgp.js

@@ -1,7 +1,7 @@
 import ko from 'ko';
 
 import { pString } from 'Common/Utils';
-import { KeyState, Magics } from 'Common/Enums';
+import { KeyState } from 'Common/Enums';
 
 import { popup, command } from 'Knoin/Knoin';
 import { AbstractViewNext } from 'Knoin/AbstractViewNext';
@@ -65,7 +65,7 @@ class MessageOpenPgpPopupView extends AbstractViewNext {
 
 			this.cancelCommand();
 			this.resultCallback(privateKey);
-		}, Magics.Time100ms);
+		}, 100);
 	}
 
 	clearPopup() {

dev/View/Popup/NewOpenPgpKey.js

@@ -1,6 +1,5 @@
 import ko from 'ko';
 
-import { Magics } from 'Common/Enums';
 import { delegateRun, pInt } from 'Common/Utils';
 
 import PgpStore from 'Stores/User/Pgp';
@@ -24,7 +23,7 @@ class NewOpenPgpKeyPopupView extends AbstractViewNext {
 
 		this.name = ko.observable('');
 		this.password = ko.observable('');
-		this.keyBitLength = ko.observable(Magics.BitLength2048);
+		this.keyBitLength = ko.observable(2048);
 
 		this.submitRequest = ko.observable(false);
 		this.submitError = ko.observable('');
@@ -81,7 +80,7 @@ class NewOpenPgpKeyPopupView extends AbstractViewNext {
 				this.submitRequest(false);
 				this.showError(e);
 			}
-		}, Magics.Time100ms);
+		}, 100);
 
 		return true;
 	}
@@ -99,7 +98,7 @@ class NewOpenPgpKeyPopupView extends AbstractViewNext {
 
 		this.email('');
 		this.email.error(false);
-		this.keyBitLength(Magics.BitLength2048);
+		this.keyBitLength(2048);
 
 		this.submitError('');
 	}

dev/View/Popup/Plugin.js

@@ -1,6 +1,6 @@
 import ko from 'ko';
 
-import { KeyState, Magics, StorageResultType, Notification } from 'Common/Enums';
+import { KeyState, StorageResultType, Notification } from 'Common/Enums';
 import { isNonEmptyArray, delegateRun } from 'Common/Utils';
 import { getNotification, i18n } from 'Common/Translator';
 
@@ -45,7 +45,7 @@ class PluginPopupView extends AbstractViewNext {
 		this.tryToClosePopup = ()=>{
 			// debounce
 			d && clearTimeout(d);
-			d = setTimeout(fn, Magics.Time200ms);
+			d = setTimeout(fn, 200);
 		};
 	}
 

dev/View/User/AbstractSystemDropDown.js

@@ -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;

dev/View/User/Login.js

@@ -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;
 		}

dev/View/User/MailBox/FolderList.js

@@ -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);
 		}
 	}
 

dev/View/User/MailBox/MessageList.js

@@ -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

dev/View/User/MailBox/MessageView.js

@@ -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;
 			}