Skip to content

Commit 271576f

Browse files
author
skozlov
committed
Filter input is fixed
1 parent d7c3bf8 commit 271576f

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/js/dataGrid.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
//custom filters
108108
$scope.filters.forEach(function (filter) {
109109
var urlName = filter.model,
110-
value = $scope.$eval(urlName);
110+
value = filter.isInScope ? $scope.$eval(urlName) : $scope.$parent.$eval(urlName);
111111

112112
if (filter.disableUrl) {
113113
needApplyFilters = true;
@@ -173,8 +173,13 @@
173173
}
174174

175175
if (value) {
176-
$scope.__evaltmp = value;
177-
$scope.$eval(urlName + '=__evaltmp');
176+
if (filter.isInScope) {
177+
$scope.__evaltmp = value;
178+
$scope.$eval(urlName + '=__evaltmp');
179+
} else {
180+
$scope.$parent.__evaltmp = value;
181+
$scope.$parent.$eval(urlName + '=__evaltmp');
182+
}
178183
}
179184
});
180185

@@ -260,7 +265,7 @@
260265
$scope.filters.forEach(function (filter) {
261266
var predicate = filter.filterBy,
262267
urlName = filter.model,
263-
value = $scope.$eval(urlName),
268+
value = filter.isInScope ? $scope.$eval(urlName) : $scope.$parent.$eval(urlName),
264269
type = filter.filterType;
265270
if ($scope.customFilters[urlName]) {
266271
$scope.filtered = $scope.customFilters[urlName]($scope.filtered, value, predicate);
@@ -302,7 +307,7 @@
302307

303308
angular.forEach(angular.element(document.querySelectorAll('[filter-by]')), function (filter) {
304309
var element = angular.element(filter),
305-
isInScope = directiveElement.find(element).length > 0,
310+
isInScope = $element.find(element).length > 0,
306311
predicate = element.attr('filter-by'),
307312
filterType = element.attr('filter-type') || '',
308313
urlName = element.attr('ng-model'),
@@ -329,7 +334,7 @@
329334
element.attr('ng-change', 'filter()');
330335
//$compile(element)($scope);
331336
}
332-
$compile(element)($scope);
337+
//$compile(element)($scope);
333338
filters.push({
334339
model: urlName,
335340
isInScope: isInScope,

0 commit comments

Comments
 (0)