Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-06 16:07:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename inbox() to mailbox() because we select any mailbox folder

Browse source
This commit is contained in:
djmaze 2021-02-12 14:56:16 +01:00
parent 65e9deda2a
commit 997e0561ad
5 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/Common/Links.js
View file

@ -149,7 +149,7 @@ export function themePreviewLink(theme) {
* @param {string} inboxFolderName = 'INBOX' * @param {string} inboxFolderName = 'INBOX'
* @returns {string} * @returns {string}
*/ */
export function inbox(inboxFolderName = 'INBOX') { export function mailbox(inboxFolderName = 'INBOX') {
return HASH_PREFIX + 'mailbox/' + inboxFolderName; return HASH_PREFIX + 'mailbox/' + inboxFolderName;
} }

10
dev/Common/Selector.js
View file

@ -359,15 +359,11 @@ export class Selector {
if (result) { if (result) {
this.focusedItem(result); this.focusedItem(result);
if (focused) { if (focused && ((bShiftKey && isArrow) || ' ' === sEventKey)) {
if (bShiftKey && isArrow) { focused.checked(!focused.checked());
focused.checked(!focused.checked());
} else if (' ' === sEventKey) {
focused.checked(!focused.checked());
}
} }
if ((this.autoSelect() || !!bForceSelect) && !this.isListChecked() && ' ' !== sEventKey) { if (' ' !== sEventKey && (this.autoSelect() || !!bForceSelect) && !this.isListChecked()) {
this.selectedItem(result); this.selectedItem(result);
} }

4
dev/View/User/MailBox/FolderList.js
View file

@ -18,7 +18,7 @@ import { ComposePopupView } from 'View/Popup/Compose';
import { FolderCreatePopupView } from 'View/Popup/FolderCreate'; import { FolderCreatePopupView } from 'View/Popup/FolderCreate';
import { ContactsPopupView } from 'View/Popup/Contacts'; import { ContactsPopupView } from 'View/Popup/Contacts';
class FolderListMailBoxUserView extends AbstractViewLeft { export class FolderListMailBoxUserView extends AbstractViewLeft {
constructor() { constructor() {
super('User/MailBox/FolderList', 'MailFolderList'); super('User/MailBox/FolderList', 'MailFolderList');
@ -220,5 +220,3 @@ class FolderListMailBoxUserView extends AbstractViewLeft {
} }
} }
} }
export { FolderListMailBoxUserView };

8
dev/View/User/Settings/Menu.js
View file

@ -1,12 +1,12 @@
import { KeyState } from 'Common/Enums'; import { KeyState } from 'Common/Enums';
import { leftPanelDisabled } from 'Common/Globals'; import { leftPanelDisabled } from 'Common/Globals';
import { settings, inbox } from 'Common/Links'; import { settings, mailbox } from 'Common/Links';
import { getFolderInboxName } from 'Common/Cache'; import { getFolderInboxName } from 'Common/Cache';
import { settingsMenuKeysHandler } from 'Knoin/Knoin'; import { settingsMenuKeysHandler } from 'Knoin/Knoin';
import { AbstractViewLeft } from 'Knoin/AbstractViews'; import { AbstractViewLeft } from 'Knoin/AbstractViews';
class MenuSettingsUserView extends AbstractViewLeft { export class MenuSettingsUserView extends AbstractViewLeft {
/** /**
* @param {Object} screen * @param {Object} screen
*/ */
@ -36,8 +36,6 @@ class MenuSettingsUserView extends AbstractViewLeft {
} }
backToMailBoxClick() { backToMailBoxClick() {
rl.route.setHash(inbox(getFolderInboxName())); rl.route.setHash(mailbox(getFolderInboxName()));
} }
} }
export { MenuSettingsUserView };

8
dev/View/User/Settings/Pane.js
View file

@ -1,4 +1,4 @@
import { inbox } from 'Common/Links'; import { mailbox } from 'Common/Links';
import { getFolderInboxName } from 'Common/Cache'; import { getFolderInboxName } from 'Common/Cache';
import { leftPanelDisabled } from 'Common/Globals'; import { leftPanelDisabled } from 'Common/Globals';
@ -6,7 +6,7 @@ import MessageStore from 'Stores/User/Message';
import { AbstractViewRight } from 'Knoin/AbstractViews'; import { AbstractViewRight } from 'Knoin/AbstractViews';
class PaneSettingsUserView extends AbstractViewRight { export class PaneSettingsUserView extends AbstractViewRight {
constructor() { constructor() {
super('User/Settings/Pane', 'SettingsPane'); super('User/Settings/Pane', 'SettingsPane');
@ -38,8 +38,6 @@ class PaneSettingsUserView extends AbstractViewRight {
} }
backToMailBoxClick() { backToMailBoxClick() {
rl.route.setHash(inbox(getFolderInboxName())); rl.route.setHash(mailbox(getFolderInboxName()));
} }
} }
export { PaneSettingsUserView };