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

@ -10,7 +10,7 @@ import {
import { isNormal, pString, detectDropdownVisibility, windowResizeCallback } from 'Common/Utils';
import { KeyState, Magics } from 'Common/Enums';
import { KeyState } from 'Common/Enums';
import { root, rootAdmin, rootUser, populateAuthSuffix } from 'Common/Links';
import { initOnStartOrLangChange, initNotificationLanguage } from 'Common/Translator';
import * as Events from 'Common/Events';
@ -32,9 +32,7 @@ class AbstractApp extends AbstractBoot {
this.isLocalAutocomplete = true;
this.lastErrorTime = 0;
addEventListener('resize', () => {
Events.pub('window.resize');
});
addEventListener('resize', () => Events.pub('window.resize'));
var t;
Events.sub(
@ -53,7 +51,7 @@ class AbstractApp extends AbstractBoot {
Events.pub('window.resize.real');
}
t = 0;
}, Magics.Time50ms);
}, 50);
}
}
);
@ -84,7 +82,7 @@ class AbstractApp extends AbstractBoot {
const fn = ()=>{
// debounce
d && clearTimeout(d);
d = setTimeout(()=>Events.pub('rl.auto-logout-refresh'), Magics.Time5s);
d = setTimeout(()=>Events.pub('rl.auto-logout-refresh'), 5000);
}
$doc.addEventListener('mousemove', fn);
@ -141,7 +139,7 @@ class AbstractApp extends AbstractBoot {
redirectToAdminPanel() {
setTimeout(() => {
location.href = rootAdmin();
}, Magics.Time100ms);
}, 100);
}
clearClientSideToken() {
@ -190,7 +188,7 @@ class AbstractApp extends AbstractBoot {
}
$win.trigger('rl.tooltips.diactivate');
}, Magics.Time100ms);
}, 100);
} else {
routeOff();
setHash(root(), true);
@ -204,7 +202,7 @@ class AbstractApp extends AbstractBoot {
}
$win.trigger('rl.tooltips.diactivate');
}, Magics.Time100ms);
}, 100);
}
}
@ -239,15 +237,11 @@ class AbstractApp extends AbstractBoot {
initOnStartOrLangChange(initNotificationLanguage);
setTimeout(windowResizeCallback, Magics.Time1s);
setTimeout(windowResizeCallback, 1000);
Events.sub('ssm.mobile-enter', () => {
leftPanelDisabled(true);
});
Events.sub('ssm.mobile-enter', () => leftPanelDisabled(true));
Events.sub('ssm.mobile-leave', () => {
leftPanelDisabled(false);
});
Events.sub('ssm.mobile-leave', () => leftPanelDisabled(false));
if (!mobile) {
$htmlCL.add('rl-desktop');
@ -268,34 +262,22 @@ class AbstractApp extends AbstractBoot {
ssm.addState({
id: 'tablet',
query: '(min-width: 768px) and (max-width: 999px)',
onEnter: () => {
$htmlCL.add('ssm-state-tablet');
},
onLeave: () => {
$htmlCL.remove('ssm-state-tablet');
}
onEnter: () => $htmlCL.add('ssm-state-tablet'),
onLeave: () => $htmlCL.remove('ssm-state-tablet')
});
ssm.addState({
id: 'desktop',
query: '(min-width: 1000px) and (max-width: 1400px)',
onEnter: () => {
$htmlCL.add('ssm-state-desktop');
},
onLeave: () => {
$htmlCL.remove('ssm-state-desktop');
}
onEnter: () => $htmlCL.add('ssm-state-desktop'),
onLeave: () => $htmlCL.remove('ssm-state-desktop')
});
ssm.addState({
id: 'desktop-large',
query: '(min-width: 1401px)',
onEnter: () => {
$htmlCL.add('ssm-state-desktop-large');
},
onLeave: () => {
$htmlCL.remove('ssm-state-desktop-large');
}
onEnter: () => $htmlCL.add('ssm-state-desktop-large'),
onLeave: () => $htmlCL.remove('ssm-state-desktop-large')
});
} else {
$htmlCL.add('ssm-state-mobile', 'rl-mobile');

View file

@ -16,8 +16,7 @@ import {
FolderType,
SetSystemFoldersNotification,
MessageSetAction,
ClientSideKeyName,
Magics
ClientSideKeyName
} from 'Common/Enums';
import { $htmlCL, leftPanelDisabled, bMobileDevice } from 'Common/Globals';
@ -125,29 +124,26 @@ class AppUser extends AbstractApp {
this.quotaDebounce = ()=>{
// debounce
qd && clearTimeout(qd);
qd = setTimeout(o.quota, Magics.Time30s);
qd = setTimeout(o.quota, 30000);
};
this.moveOrDeleteResponseHelper = this.moveOrDeleteResponseHelper.bind(this);
setInterval(() => Events.pub('interval.30s'), Magics.Time30s);
setInterval(() => Events.pub('interval.1m'), Magics.Time1m);
setInterval(() => Events.pub('interval.2m'), Magics.Time2m);
setInterval(() => Events.pub('interval.3m'), Magics.Time3m);
setInterval(() => Events.pub('interval.5m'), Magics.Time5m);
setInterval(() => Events.pub('interval.10m'), Magics.Time10m);
setInterval(() => Events.pub('interval.15m'), Magics.Time15m);
setInterval(() => Events.pub('interval.20m'), Magics.Time20m);
setInterval(() => Events.pub('interval.30s'), 30000);
setInterval(() => Events.pub('interval.1m'), 60000);
setInterval(() => Events.pub('interval.2m'), 120000);
setInterval(() => Events.pub('interval.3m'), 180000);
setInterval(() => Events.pub('interval.5m'), 300000);
setInterval(() => Events.pub('interval.10m'), 600000);
setInterval(() => Events.pub('interval.15m'), 900000);
setInterval(() => Events.pub('interval.20m'), 1200000);
setTimeout(() => setInterval(() => Events.pub('interval.2m-after5m'), Magics.Time2m), Magics.Time5m);
setTimeout(() => setInterval(() => Events.pub('interval.5m-after5m'), Magics.Time5m), Magics.Time5m);
setTimeout(
() => setInterval(() => Events.pub('interval.10m-after5m'), Magics.Time10m),
Magics.Time5m
);
setTimeout(() => setInterval(() => Events.pub('interval.2m-after5m'), 120000), 300000);
setTimeout(() => setInterval(() => Events.pub('interval.5m-after5m'), 300000), 300000);
setTimeout(() => setInterval(() => Events.pub('interval.10m-after5m'), 600000), 300000);
// wakeUp
const interval = Magics.Time60m;
const interval = 3600000; // 60m
var lastTime = (new Date()).getTime();
setInterval(() => {
const currentTime = (new Date()).getTime();
@ -175,7 +171,7 @@ class AppUser extends AbstractApp {
$htmlCL.add('UserBackground');
doc.body.style.backgroundImage = "url("+img+")";
}
}, Magics.Time1s);
}, 1000);
}
}
@ -1145,8 +1141,8 @@ class AppUser extends AbstractApp {
contactsSyncInterval = 5 <= contactsSyncInterval ? contactsSyncInterval : 20;
contactsSyncInterval = 320 >= contactsSyncInterval ? contactsSyncInterval : 320;
setTimeout(() => this.contactsSync(), Magics.Time10s);
setTimeout(() => this.folderInformationMultiply(true), Magics.Time2s);
setTimeout(() => this.contactsSync(), 10000);
setTimeout(() => this.folderInformationMultiply(true), 2000);
setInterval(() => this.contactsSync(), contactsSyncInterval * 60000 + 5000);