kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-06-10 15:28:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(filterFilter): don't interpret dots in predicate object fields as paths

Browse Source 
Closes #6005
Closes #6009
This commit is contained in:
Igor Minar
2014-01-27 17:35:27 -08:00
parent 29432ffe37
commit 339a1658cd
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ng/filter/filter.js
View File

@@ -188,7 +188,7 @@ function filterFilter() {
(function(path) { (function(path) {
if (typeof expression[path] == 'undefined') return; if (typeof expression[path] == 'undefined') return;
predicates.push(function(value) { predicates.push(function(value) {
return search(path == '$' ? value : getter(value, path), expression[path]); return search(path == '$' ? value : (value && value[path]), expression[path]);
}); });
})(key); })(key);
} }

10
test/ng/filter/filterSpec.js
View File

@@ -60,6 +60,16 @@ describe('Filter: filter', function() {
expect(filter(items, {first:'misko', last:'hevery'})[0]).toEqual(items[0]); expect(filter(items, {first:'misko', last:'hevery'})[0]).toEqual(items[0]);
}); });
it('should support predicat object with dots in the name', function() {
var items = [{'first.name': 'misko', 'last.name': 'hevery'},
{'first.name': 'adam', 'last.name': 'abrons'}];
expect(filter(items, {'first.name':'', 'last.name':''}).length).toBe(2);
expect(filter(items, {'first.name':'misko', 'last.name':''})).toEqual([items[0]]);
});
it('should match any properties for given "$" property', function() { it('should match any properties for given "$" property', function() {
var items = [{first: 'tom', last: 'hevery'}, var items = [{first: 'tom', last: 'hevery'},
{first: 'adam', last: 'hevery', alias: 'tom', done: false}, {first: 'adam', last: 'hevery', alias: 'tom', done: false},