freifunk/hopglass
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

filters: combine filters first

Browse source
This commit is contained in:
Nils Schneider 2015-07-08 21:17:00 +02:00
parent 036b6d6099
commit 653a329698
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/datadistributor.js
View file

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

4
lib/filters/genericnode.js
View file

@ -1,4 +1,4 @@
define(["filters/nodefilter"], function (nodefilter) { define([], function () {
return function (name, key, value, f) { return function (name, key, value, f) {
var negate = false var negate = false
var refresh var refresh
@ -44,7 +44,7 @@ define(["filters/nodefilter"], function (nodefilter) {
} }
} }
return { run: nodefilter(run), return { run: run,
setRefresh: setRefresh, setRefresh: setRefresh,
render: render render: render
} }