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

@ -44,6 +44,10 @@ import Remote from 'Remote/User/Fetch';
import { command, showScreenPopup, popupVisibility } from 'Knoin/Knoin';
import { AbstractViewRight } from 'Knoin/AbstractViews';
import { FolderClearPopupView } from 'View/Popup/FolderClear';
import { ComposePopupView } from 'View/Popup/Compose';
import { AdvancedSearchPopupView } from 'View/Popup/AdvancedSearch';
const
Settings = rl.settings,
canBeMovedHelper = (self) => self.canBeMoved(),
@ -244,7 +248,7 @@ class MessageListMailBoxUserView extends AbstractViewRight {
@command()
clearCommand() {
if (Settings.capa(Capa.DangerousActions)) {
showScreenPopup(require('View/Popup/FolderClear'), [FolderStore.currentFolder()]);
showScreenPopup(FolderClearPopupView, [FolderStore.currentFolder()]);
}
}
@ -258,7 +262,7 @@ class MessageListMailBoxUserView extends AbstractViewRight {
@command(canBeMovedHelper)
multyForwardCommand() {
if (Settings.capa(Capa.Composer)) {
showScreenPopup(require('View/Popup/Compose'), [
showScreenPopup(ComposePopupView, [
ComposeType.ForwardAsAttachment,
MessageStore.messageListCheckedOrSelected()
]);
@ -350,7 +354,7 @@ class MessageListMailBoxUserView extends AbstractViewRight {
composeClick() {
if (Settings.capa(Capa.Composer)) {
showScreenPopup(require('View/Popup/Compose'));
showScreenPopup(ComposePopupView);
}
}
@ -761,7 +765,7 @@ class MessageListMailBoxUserView extends AbstractViewRight {
if (Settings.capa(Capa.Composer)) {
// write/compose (open compose popup)
shortcuts.add('w,c,new', '', [KeyState.MessageList, KeyState.MessageView], () => {
showScreenPopup(require('View/Popup/Compose'));
showScreenPopup(ComposePopupView);
return false;
});
}
@ -887,7 +891,7 @@ class MessageListMailBoxUserView extends AbstractViewRight {
advancedSearchClick() {
Settings.capa(Capa.SearchAdv)
&& showScreenPopup(require('View/Popup/AdvancedSearch'), [this.mainMessageListSearch()]);
&& showScreenPopup(AdvancedSearchPopupView, [this.mainMessageListSearch()]);
}
quotaTooltip() {