|
@@ -1,4 +1,4 @@
|
|
|
-define([], function () {
|
|
|
+define(["filters/nodefilter"], function (NodeFilter) {
|
|
|
return function () {
|
|
|
var targets = []
|
|
|
var filterObservers = []
|
|
@@ -26,9 +26,13 @@ define([], function () {
|
|
|
if (data === undefined)
|
|
|
return
|
|
|
|
|
|
- filteredData = filters.reduce( function (a, f) {
|
|
|
- return f.run(a)
|
|
|
- }, data)
|
|
|
+ var filter = filters.reduce( function (a, f) {
|
|
|
+ return function (d) {
|
|
|
+ return a(d) && f.run(d)
|
|
|
+ }
|
|
|
+ }, function () { return true })
|
|
|
+
|
|
|
+ filteredData = new NodeFilter(filter)(data)
|
|
|
|
|
|
targets.forEach( function (t) {
|
|
|
t.setData(filteredData)
|