From b047f6ca9a2b60f2a095be7d216752f40cd58aea Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 27 Sep 2022 16:57:29 +0200
Subject: [PATCH] simplify messagelist dragOverArea
---
dev/View/User/MailBox/MessageList.js | 14 ++++++--------
.../app/templates/Views/User/MailMessageList.html | 4 ++--
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 88392811e..97a2803f3 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -87,9 +87,6 @@ export class MailMessageList extends AbstractViewRight {
moreDropdownTrigger: false,
sortDropdownTrigger: false,
- dragOverArea: null,
- dragOverBodyArea: null,
-
focusSearch: false
});
@@ -575,9 +572,10 @@ export class MailMessageList extends AbstractViewRight {
}
onBuild(dom) {
- const eqs = (ev, s) => ev.target.closestWithin(s, dom);
+ const b_content = dom.querySelector('.b-content'),
+ eqs = (ev, s) => ev.target.closestWithin(s, dom);
- this.selector.init(dom.querySelector('.b-content'), Scope.MessageList);
+ this.selector.init(b_content, Scope.MessageList);
addEventsListeners(dom, {
click: event => {
@@ -606,7 +604,7 @@ export class MailMessageList extends AbstractViewRight {
// initUploaderForAppend
- if (Settings.app('allowAppendMessage') && this.dragOverArea()) {
+ if (Settings.app('allowAppendMessage')) {
const oJua = new Jua({
action: serverRequest('Append'),
name: 'AppendFile',
@@ -614,8 +612,8 @@ export class MailMessageList extends AbstractViewRight {
hidden: {
Folder: () => FolderUserStore.currentFolderFullName()
},
- dragAndDropElement: this.dragOverArea(),
- dragAndDropBodyElement: this.dragOverBodyArea()
+ dragAndDropElement: dom.querySelector('.listDragOver'),
+ dragAndDropBodyElement: b_content
});
this.dragOver.subscribe(value => value && this.selector.scrollToTop());
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 8fe27ddb3..1681d6f31 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
@@ -106,11 +106,11 @@
▼
-