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

Support regex extension (SIEVE) (#1043)

Browse source 
+ Update jquery
This commit is contained in:
RainLoop Team 2016-05-27 00:38:39 +03:00
parent 2fefad437e
commit c0ab236440
8 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/Common/Enums.jsx
View file

@ -345,6 +345,7 @@ export const FilterConditionType = {
'NotContains': 'NotContains',
'EqualTo': 'EqualTo',
'NotEqualTo': 'NotEqualTo',
'Regex': 'Regex',
'Over': 'Over',
'Under': 'Under'
};

5
dev/View/Popup/Filter.js
View file

@ -149,6 +149,11 @@
{'id': Enums.FilterConditionType.NotEqualTo, 'name': Translator.i18n('POPUPS_FILTER/SELECT_TYPE_NOT_EQUAL_TO')}
]);
if (oModules && oModules.regex)
{
this.typeOptions.push({'id': Enums.FilterConditionType.Regex, 'name': 'Regex'});
}
this.typeOptionsSize([
{'id': Enums.FilterConditionType.Over, 'name': Translator.i18n('POPUPS_FILTER/SELECT_TYPE_OVER')},
{'id': Enums.FilterConditionType.Under, 'name': Translator.i18n('POPUPS_FILTER/SELECT_TYPE_UNDER')}

11
dev/bootstrap.jsx
View file

@ -17,12 +17,11 @@ export default (App) => {
Globals.__APP__ = App;
Globals.$win
.keydown(Utils.kill_CtrlA_CtrlS)
.unload(function () {
Globals.bUnload = true;
})
;
Globals.$win.on('keydown', Utils.kill_CtrlA_CtrlS);
Globals.$win.on('unload', function () {
Globals.bUnload = true;
});
Globals.$html
.addClass(Globals.bMobileDevice ? 'mobile' : 'no-mobile')