amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-16 05:44:53 +00:00
Code Issues Projects Releases Wiki Activity

(js) Improve sg-search directive

Browse Source 
Will now respect the "listRequiresDot" source parameter and uses
ng-messages to show an error if the minimum number of characters is not
reached.

Fixes #438, #3464
This commit is contained in:
Francis Lachapelle
2016-02-24 21:41:03 -05:00
parent 4b816677b0
commit 70fbeab27a
12 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Common/sgSearch.directive.js
+18 -10
View File
@@ -60,6 +60,13 @@
return function postLink(scope, iElement, iAttr, controller) {
var compiledButtonEl = iElement.find('button');
// Retrive the form and input names to check the form's validity in the controller
controller.formName = iElement.attr('name');
controller.inputName = inputEl.attr('name');
// Associate the sg-allow-dot parameter (boolean) to the controller
controller.allowDot = $parse(iElement.attr('sg-allow-dot'))(scope);
// Associate callback to controller
controller.doSearch = $parse(iElement.attr('sg-search'));
@@ -99,7 +106,6 @@
minLength = angular.isNumber($window.minimumSearchLength)? $window.minimumSearchLength : 2;
// Controller variables
vm.previous = { searchText: '', searchField: '' };
vm.searchText = null;
// Model options
@@ -113,20 +119,22 @@
// Method to call on data changes
vm.onChange = function() {
if (typeof vm.searchText !== 'undefined' && vm.searchText !== null) {
if (vm.searchText != vm.previous.searchText || vm.searchField != vm.previous.searchField) {
if (vm.searchText.length > minLength || vm.searchText.length === 0 || vm.searchText == '.') {
// doSearch is the compiled expression of the sg-search attribute
vm.doSearch($scope, { searchText: vm.searchText, searchField: vm.searchField });
}
vm.previous = { searchText: vm.searchText, searchField: vm.searchField };
}
var form = $scope[vm.formName],
input = form[vm.inputName],
rawSearchText = input.$viewValue;
if (vm.allowDot && rawSearchText == '.' || form.$valid) {
if (rawSearchText == '.')
// Ignore the minlength constraint when using the dot operator
input.$setValidity('minlength', true);
// doSearch is the compiled expression of the sg-search attribute
vm.doSearch($scope, { searchText: rawSearchText, searchField: vm.searchField });
}
};
// Reset input field when cancelling the search
vm.cancelSearch = function() {
vm.previous = { searchText: '', searchField: '' };
vm.searchText = null;
};
}