diff --git a/dev/External/User/ko.js b/dev/External/User/ko.js index fc423232f..5d8a95d28 100644 --- a/dev/External/User/ko.js +++ b/dev/External/User/ko.js @@ -3,7 +3,6 @@ import ko from 'ko'; import { HtmlEditor } from 'Common/Html'; import { timeToNode } from 'Common/Translator'; import { doc, elementById, addEventsListeners, dropdowns, leftPanelDisabled } from 'Common/Globals'; -import { dropdownsDetectVisibility } from 'Common/UtilsUser'; import { EmailAddressesComponent } from 'Component/EmailAddresses'; import { ThemeStore } from 'Stores/Theme'; import { dropFilesInFolder } from 'Common/Folders'; @@ -247,18 +246,5 @@ Object.assign(ko.bindingHandlers, { dropdowns.push(element); element.ddBtn = new BSN.Dropdown(element.querySelector('.dropdown-toggle')); } - }, - - openDropdownTrigger: { - update: (element, fValueAccessor) => { - if (ko.unwrap(fValueAccessor())) { - const el = element.ddBtn; - el.open || el.toggle(); - // el.focus(); - - dropdownsDetectVisibility(); - fValueAccessor()(false); - } - } } }); diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index 78a46f355..283664276 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -207,7 +207,7 @@ export class ComposePopupView extends AbstractViewPopup { this.allowSpellcheck = SettingsUserStore.allowSpellcheck; addObservablesTo(this, { - identitiesDropdownTrigger: false, + identitiesMenu: false, from: '', to: '', @@ -1136,7 +1136,7 @@ export class ComposePopupView extends AbstractViewPopup { addShortcut('w', 'meta', ScopeCompose, ()=>false); addShortcut('m', 'meta', ScopeCompose, () => { - this.identitiesDropdownTrigger(true); + this.identitiesMenu().ddBtn.toggle(); return false; }); diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js index bfed106c7..379909a2d 100644 --- a/dev/View/User/MailBox/MessageList.js +++ b/dev/View/User/MailBox/MessageList.js @@ -112,9 +112,6 @@ export class MailMessageList extends AbstractViewRight { this.userUsageProc = FolderUserStore.quotaPercentage; addObservablesTo(this, { - moreDropdownTrigger: false, - sortDropdownTrigger: false, - focusSearch: false }); diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 045cb70bb..ec3e29529 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -105,8 +105,6 @@ export class MailMessageView extends AbstractViewRight { showAttachmentControls: !!Local.get(ClientSideKeyNameMessageAttachmentControls), downloadAsZipLoading: false, showFullInfo: '1' === Local.get(ClientSideKeyNameMessageHeaderFullInfo), - moreDropdownTrigger: false, - // viewer viewFromShort: '', dkimData: ['none', '', ''] diff --git a/dev/View/User/SystemDropDown.js b/dev/View/User/SystemDropDown.js index 04687d8fe..f5a0e1b1e 100644 --- a/dev/View/User/SystemDropDown.js +++ b/dev/View/User/SystemDropDown.js @@ -36,7 +36,7 @@ export class SystemDropDownUserView extends AbstractViewRight { addObservablesTo(this, { currentAudio: '', - accountMenuDropdownTrigger: false + accountMenu: false }); this.allowContacts = AppUserStore.allowContacts(); @@ -115,7 +115,7 @@ export class SystemDropDownUserView extends AbstractViewRight { registerShortcut('m', '', [ScopeMessageList, ScopeMessageView, ScopeSettings], () => { if (!this.viewModelDom.hidden) { // exitFullscreen(); - this.accountMenuDropdownTrigger(true); + this.accountMenu().ddBtn.toggle(); return false; } }); diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html index 39a62aec3..915258298 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html @@ -18,7 +18,7 @@ 🗑 -