|
107 | 107 | //custom filters |
108 | 108 | $scope.filters.forEach(function (filter) { |
109 | 109 | var urlName = filter.model, |
110 | | - value = $scope.$eval(urlName); |
| 110 | + value = filter.isInScope ? $scope.$eval(urlName) : $scope.$parent.$eval(urlName); |
111 | 111 |
|
112 | 112 | if (filter.disableUrl) { |
113 | 113 | needApplyFilters = true; |
|
173 | 173 | } |
174 | 174 |
|
175 | 175 | 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 | + } |
178 | 183 | } |
179 | 184 | }); |
180 | 185 |
|
|
260 | 265 | $scope.filters.forEach(function (filter) { |
261 | 266 | var predicate = filter.filterBy, |
262 | 267 | urlName = filter.model, |
263 | | - value = $scope.$eval(urlName), |
| 268 | + value = filter.isInScope ? $scope.$eval(urlName) : $scope.$parent.$eval(urlName), |
264 | 269 | type = filter.filterType; |
265 | 270 | if ($scope.customFilters[urlName]) { |
266 | 271 | $scope.filtered = $scope.customFilters[urlName]($scope.filtered, value, predicate); |
|
302 | 307 |
|
303 | 308 | angular.forEach(angular.element(document.querySelectorAll('[filter-by]')), function (filter) { |
304 | 309 | var element = angular.element(filter), |
305 | | - isInScope = directiveElement.find(element).length > 0, |
| 310 | + isInScope = $element.find(element).length > 0, |
306 | 311 | predicate = element.attr('filter-by'), |
307 | 312 | filterType = element.attr('filter-type') || '', |
308 | 313 | urlName = element.attr('ng-model'), |
|
329 | 334 | element.attr('ng-change', 'filter()'); |
330 | 335 | //$compile(element)($scope); |
331 | 336 | } |
332 | | - $compile(element)($scope); |
| 337 | + //$compile(element)($scope); |
333 | 338 | filters.push({ |
334 | 339 | model: urlName, |
335 | 340 | isInScope: isInScope, |
|
0 commit comments