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

Merge branch 'master' into patch-1

Browse source
This commit is contained in:
Maarten 2024-06-09 16:43:46 +02:00 • committed by GitHub
commit 92ed4fcc81
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
82 changed files with 607 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
text: '',
keyword: '',
repliedValue: -1,
selectedDateValue: -1,
selectedDateValue: 0,
selectedTreeValue: '',
hasAttachment: false,
@ -58,7 +58,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
// We should think about migrating all SEARCH/DATE_ to either SEARCH/SINCE_DATE or SEARCH/BEFORE_DATE
// and adjust the prefix accordingly
// let prefix_since = 'SEARCH/SINCE_DATE_';
let prefix = 'SEARCH/DATE_';
let prefix = 'SEARCH/SINCE_';
let prefix_before = 'SEARCH/BEFORE_DATE_';
return [
{ id: -365, name: i18n(prefix_before + 'YEAR') },
@ -67,7 +67,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
{ id: -30, name: i18n(prefix_before + 'MONTH') },
{ id: -7, name: i18n(prefix_before + '7_DAYS') },
{ id: -3, name: i18n(prefix_before + '3_DAYS') },
{ id: -1, name: i18n(prefix + 'ALL') },
{ id: 0, name: i18n('SEARCH/DATE_ALL') },
{ id: 3, name: i18n(prefix + '3_DAYS') },
{ id: 7, name: i18n(prefix + '7_DAYS') },
{ id: 30, name: i18n(prefix + 'MONTH') },
@ -110,7 +110,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
append('text', self.text().trim());
append('keyword', self.keyword());
append('in', self.selectedTreeValue());
if (-1 < self.selectedDateValue()) {
if (0 < self.selectedDateValue()) {
let d = new Date();
d.setDate(d.getDate() - self.selectedDateValue());
append('since', d.toISOString().split('T')[0]);
@ -151,8 +151,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
self.text(pString(params.get('text')));
self.keyword(pString(params.get('keyword')));
self.selectedTreeValue(pString(params.get('in')));
// self.selectedDateValue(params.get('since'));
self.selectedDateValue(-1);
self.selectedDateValue(0);
self.hasAttachment(params.has('attachment'));
self.starred(params.has('flagged'));
self.unseen(params.has('unseen'));