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

Improved new AdvancedSearch

Browse source
This commit is contained in:
djmaze 2021-11-03 14:47:03 +01:00
parent 5a67c10056
commit ba895ba887
2 changed files with 94 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

57
dev/View/Popup/AdvancedSearch.js
View file

@ -85,52 +85,33 @@ class AdvancedSearchPopupView extends AbstractViewPopup {
buildSearchString() {
const
result = new FormData();
let value = this.from().trim();
if (value) {
result.set('from', value);
}
value = this.to().trim();
if (value) {
result.set('to', value);
}
value = this.subject().trim();
if (value) {
result.set('subject', value);
}
if (this.hasAttachment()) {
result.set('has', 'attachment');
}
if (this.unseen()) {
result.set('is[]', 'unseen');
}
if (this.starred()) {
result.set('is[]', 'flagged');
}
data = new FormData(),
append = (key, value) => value.length && data.append(key, value);
append('from', this.from().trim());
append('to', this.to().trim());
append('subject', this.subject().trim());
append('text', this.text().trim());
append('in', this.selectedTreeValue());
if (-1 < this.selectedDateValue()) {
let d = new Date();
d.setDate(d.getDate() - this.selectedDateValue());
result.set('date', d.format('Y.m.d') + '/');
append('date', d.format('Y.m.d') + '/');
}
value = this.selectedTreeValue();
if (value) {
result.set('in', value);
let result = new URLSearchParams(data).toString();
if (this.hasAttachment()) {
result += '&attachment';
}
if (this.unseen()) {
result += '&unseen';
}
if (this.starred()) {
result += '&flagged';
}
value = this.text().trim();
if (value) {
result.set('text', value);
}
return new URLSearchParams(result).toString();
return result.replace(/^&+/, '');
}
clearPopup() {