Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove the old "move to folder" behaviour option

Browse source
This commit is contained in:
the-djmaze 2022-09-29 10:08:45 +02:00
parent 456f304338
commit 2651b6fd93
34 changed files with 8 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/Settings/Admin/General.js
View file

@ -35,7 +35,7 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
this.theme = ThemeStore.theme;
this.themes = ThemeStore.themes;
this.addSettings(['AllowLanguagesOnSettings','NewMoveToFolder']);
this.addSettings(['AllowLanguagesOnSettings']);
addObservablesTo(this, {
attachmentLimitTrigger: SaveSettingStatus.Idle,

1
dev/Styles/User/Layout.less
View file

@ -143,7 +143,6 @@ html.rl-side-preview-pane {
}
#top-system-dropdown-id::after,
#move-dropdown-id.dropdown-toggle::after,
#button-add-prop-dropdown-id::after {
content: '▼';
font-size: 80%;

28
dev/View/User/MailBox/MessageList.js
View file

@ -5,14 +5,14 @@ import { Scope } from 'Common/Enums';
import { ComposeType, FolderType, MessageSetAction } from 'Common/EnumsUser';
import { leftPanelDisabled, moveAction,
Settings, SettingsCapa, SettingsGet,
Settings, SettingsCapa,
addEventsListeners,
addShortcut, registerShortcut, formFieldFocused
} from 'Common/Globals';
import { computedPaginatorHelper, showMessageComposer, populateMessageBody } from 'Common/UtilsUser';
import { FileInfo } from 'Common/File';
import { folderListOptionsBuilder, moveMessagesToFolder } from 'Common/Folders';
import { moveMessagesToFolder } from 'Common/Folders';
import { isFullscreen, toggleFullscreen } from 'Common/Fullscreen';
import { mailBox, serverRequest } from 'Common/Links';
@ -70,8 +70,6 @@ export class MailMessageList extends AbstractViewRight {
constructor() {
super();
this.newMoveToFolder = !!SettingsGet('NewMoveToFolder');
this.allowDangerousActions = SettingsCapa('DangerousActions');
this.messageList = MessagelistUserStore;
@ -91,7 +89,6 @@ export class MailMessageList extends AbstractViewRight {
this.userUsageProc = FolderUserStore.quotaPercentage;
this.addObservables({
moveDropdownTrigger: false,
moreDropdownTrigger: false,
sortDropdownTrigger: false,
@ -107,13 +104,6 @@ export class MailMessageList extends AbstractViewRight {
sortSupported: () =>
FolderUserStore.hasCapability('SORT') | FolderUserStore.hasCapability('ESORT'),
folderMenuForMove: () =>
folderListOptionsBuilder(
[FolderUserStore.currentFolderFullName()],
[],
item => item ? item.localName() : ''
),
messageListSearchDesc: () => {
const value = MessagelistUserStore().Search;
return value ? i18n('MESSAGE_LIST/SEARCH_RESULT_FOR', { SEARCH: value }) : ''
@ -233,7 +223,6 @@ export class MailMessageList extends AbstractViewRight {
spamCommand: canBeMovedHelper,
notSpamCommand: canBeMovedHelper,
moveCommand: canBeMovedHelper,
moveNewCommand: canBeMovedHelper,
});
}
@ -283,10 +272,8 @@ export class MailMessageList extends AbstractViewRight {
moveMessagesToFolderType(FolderType.NotSpam);
}
moveCommand() {}
moveNewCommand(vm, event) {
if (this.newMoveToFolder && this.mobileCheckedStateShow()) {
moveCommand(vm, event) {
if (this.mobileCheckedStateShow()) {
if (vm && event?.preventDefault) {
event.preventDefault();
event.stopPropagation();
@ -669,12 +656,7 @@ export class MailMessageList extends AbstractViewRight {
// move
registerShortcut('insert', '', Scope.MessageList, () => {
if (this.newMoveToFolder) {
this.moveNewCommand();
} else {
this.moveDropdownTrigger(true);
}
this.moveCommand();
return false;
});