This version uses Rollup instead of WebPack.

Due to that the code is smaller and has changes to prevent Circular Dependencies
This commit is contained in:
djmaze 2021-01-25 22:00:13 +01:00
parent 5e63ade9dd
commit ad8fd8879b
49 changed files with 595 additions and 577 deletions

View file

@ -8,6 +8,9 @@ import { settings } from 'Common/Links';
import { showScreenPopup } from 'Knoin/Knoin';
import { AbstractViewRight } from 'Knoin/AbstractViews';
import { KeyboardShortcutsHelpPopupView } from 'View/Popup/KeyboardShortcutsHelp';
import { AccountPopupView } from 'View/Popup/Account';
const Settings = rl.settings;
export class AbstractSystemDropDownUserView extends AbstractViewRight {
@ -63,13 +66,13 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight {
settingsHelp() {
if (Settings.capa(Capa.Help)) {
showScreenPopup(require('View/Popup/KeyboardShortcutsHelp'));
showScreenPopup(KeyboardShortcutsHelpPopupView);
}
}
addAccountClick() {
if (this.capaAdditionalAccounts()) {
showScreenPopup(require('View/Popup/Account'));
showScreenPopup(AccountPopupView);
}
}
@ -89,7 +92,7 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight {
// shortcuts help
shortcuts.add('?,f1,help', '', [KeyState.MessageList, KeyState.MessageView, KeyState.Settings], () => {
if (this.viewModelVisible) {
showScreenPopup(require('View/Popup/KeyboardShortcutsHelp'));
showScreenPopup(KeyboardShortcutsHelpPopupView);
return false;
}
return true;