amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-29 01:52:45 +00:00
Code Issues Projects Releases Wiki Activity

(js) Improve sg-search directive

Browse Source
This commit is contained in:
Francis Lachapelle
2016-02-25 10:10:53 -05:00
parent e5fe211dcd
commit b294c5381a
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
UI/Templates/MailerUI/UIxMailFolderTemplate.wox
View File

@@ -128,7 +128,10 @@
<md-icon>arrow_back</md-icon>
</md-button>
<md-input-container class="md-flex" md-no-float="md-no-float">
<input name="folderSearch" type="search" ng-minlength="3" label:placeholder="Search"/>
<input name="folderSearch" type="search" var:minlength="minimumSearchLength" label:placeholder="Search"/>
<div ng-messages="searchForm.folderSearch.$error" ng-show="searchForm.folderSearch.$dirty">
<div ng-message="minlength"><var:string value="minimumSearchLengthLabel"/></div>
</div>
</md-input-container>
<md-input-container flex="25">
<md-select>

2
UI/WebServerResources/js/Common/sgSearch.directive.js
View File

@@ -123,7 +123,7 @@
input = form[vm.inputName],
rawSearchText = input.$viewValue;
if (vm.allowDot && rawSearchText == '.' || form.$valid) {
if (vm.allowDot && rawSearchText == '.' || form.$valid && rawSearchText) {
if (rawSearchText == '.')
// Ignore the minlength constraint when using the dot operator
input.$setValidity('minlength', true);

2
UI/WebServerResources/js/Mailer/Mailbox.service.js
View File

@@ -274,7 +274,7 @@
angular.extend(options, { sortingAttributes: Mailbox.$query });
if (angular.isDefined(filters)) {
options.filters = _.reject(filters, function(filter) {
return angular.isUndefined(filter.searchInput) || filter.searchInput.length === 0;
return !filter.searchInput || filter.searchInput.length === 0;
});
// Decompose filters that match two fields
_.each(options.filters, function(filter) {