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

simplify messagelist dragOverArea

Browse source
This commit is contained in:
the-djmaze 2022-09-27 16:57:29 +02:00
parent c64ec1b2d8
commit b047f6ca9a
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,9 +87,6 @@ export class MailMessageList extends AbstractViewRight {
moreDropdownTrigger: false, moreDropdownTrigger: false,
sortDropdownTrigger: false, sortDropdownTrigger: false,
dragOverArea: null,
dragOverBodyArea: null,
focusSearch: false focusSearch: false
}); });
@ -575,9 +572,10 @@ export class MailMessageList extends AbstractViewRight {
} }
onBuild(dom) { 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, { addEventsListeners(dom, {
click: event => { click: event => {
@ -606,7 +604,7 @@ export class MailMessageList extends AbstractViewRight {
// initUploaderForAppend // initUploaderForAppend
if (Settings.app('allowAppendMessage') && this.dragOverArea()) { if (Settings.app('allowAppendMessage')) {
const oJua = new Jua({ const oJua = new Jua({
action: serverRequest('Append'), action: serverRequest('Append'),
name: 'AppendFile', name: 'AppendFile',
@ -614,8 +612,8 @@ export class MailMessageList extends AbstractViewRight {
hidden: { hidden: {
Folder: () => FolderUserStore.currentFolderFullName() Folder: () => FolderUserStore.currentFolderFullName()
}, },
dragAndDropElement: this.dragOverArea(), dragAndDropElement: dom.querySelector('.listDragOver'),
dragAndDropBodyElement: this.dragOverBodyArea() dragAndDropBodyElement: b_content
}); });
this.dragOver.subscribe(value => value && this.selector.scrollToTop()); this.dragOver.subscribe(value => value && this.selector.scrollToTop());

4
snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
View file

@ -106,11 +106,11 @@
</div> </div>
<a class="btn buttonMoreSearch" data-bind="click: advancedSearchClick">▼</a> <a class="btn buttonMoreSearch" data-bind="click: advancedSearchClick">▼</a>
</div> </div>
<div class="b-content" data-bind="initDom: dragOverBodyArea"> <div class="b-content">
<div class="listThreadUidDesc" data-bind="visible: messageList.threadUid(), click: cancelThreadUid" <div class="listThreadUidDesc" data-bind="visible: messageList.threadUid(), click: cancelThreadUid"
data-icon="⬅" data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></div> data-icon="⬅" data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></div>
<div class="listSearchDesc" data-bind="visible: messageListSearchDesc(), text: messageListSearchDesc"></div> <div class="listSearchDesc" data-bind="visible: messageListSearchDesc(), text: messageListSearchDesc"></div>
<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && !messageList.error() && !popupVisibility(), 'dragOverEnter': dragOverEnter }, initDom: dragOverArea" <div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && !messageList.error() && !popupVisibility(), 'dragOverEnter': dragOverEnter }"
data-icon="⬇" data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></div> data-icon="⬇" data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></div>
<div class="listClear" data-bind="visible: clearListIsVisible()"> <div class="listClear" data-bind="visible: clearListIsVisible()">
<a href="#" class="g-ui-link" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER" data-bind="click: clear"></a> <a href="#" class="g-ui-link" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER" data-bind="click: clear"></a>