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

more refactoring

Browse source
This commit is contained in:
Nils Schneider 2015-03-25 16:36:24 +01:00
parent a935c765c4
commit a2669373a0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/main.js
View file

@ -15,7 +15,7 @@ function (Map, Sidebar, Meshstats, Linklist, SimpleNodelist, Infobox) {
var infobox = new Infobox(config, sidebar, gotoAnything) var infobox = new Infobox(config, sidebar, gotoAnything)
gotoAnything.addTarget(infobox) gotoAnything.addTarget(infobox)
var map = new Map(sidebar, gotoAnything) var map = new Map(linkScale, sidebar, gotoAnything)
document.body.insertBefore(map.div, document.body.firstChild) document.body.insertBefore(map.div, document.body.firstChild)
gotoAnything.addTarget(map) gotoAnything.addTarget(map)
@ -36,11 +36,11 @@ function (Map, Sidebar, Meshstats, Linklist, SimpleNodelist, Infobox) {
] ]
var p = Promise.all(urls.map(getJSON)) var p = Promise.all(urls.map(getJSON))
p.then(handle_data(config, linkScale, sidebar, meshstats, linklist, newnodeslist, lostnodeslist, infobox, map, gotoAnything)) p.then(handle_data(sidebar, meshstats, linklist, newnodeslist, lostnodeslist, infobox, map, gotoAnything))
}) })
} }
function handle_data(config, linkScale, sidebar, meshstats, linklist, newnodeslist, lostnodeslist, infobox, map, gotoAnything) { function handle_data(sidebar, meshstats, linklist, newnodeslist, lostnodeslist, infobox, map, gotoAnything) {
return function (data) { return function (data) {
var nodedict = data[0] var nodedict = data[0]
var nodes = Object.keys(nodedict.nodes).map(function (key) { return nodedict.nodes[key] }) var nodes = Object.keys(nodedict.nodes).map(function (key) { return nodedict.nodes[key] })
@ -106,7 +106,7 @@ function (Map, Sidebar, Meshstats, Linklist, SimpleNodelist, Infobox) {
d.target.node.neighbours.push({ node: d.source.node, link: d }) d.target.node.neighbours.push({ node: d.source.node, link: d })
}) })
map.setData(linkScale, now, newnodes, lostnodes, onlinenodes, links) map.setData(now, newnodes, lostnodes, onlinenodes, links)
meshstats.setData(nodes) meshstats.setData(nodes)
linklist.setData(links) linklist.setData(links)
newnodeslist.setData(newnodes) newnodeslist.setData(newnodes)

4
lib/map.js
View file

@ -55,7 +55,7 @@ define(function () {
var groupOnline, group var groupOnline, group
return function (sidebar, gotoAnything) { return function (linkScale, sidebar, gotoAnything) {
var self = this var self = this
var el = document.createElement("div") var el = document.createElement("div")
@ -76,7 +76,7 @@ define(function () {
var nodeDict = {} var nodeDict = {}
var linkDict = {} var linkDict = {}
self.setData = function (linkScale, now, newnodes, lostnodes, onlinenodes, links) { self.setData = function (now, newnodes, lostnodes, onlinenodes, links) {
nodeDict = {} nodeDict = {}
linkDict = {} linkDict = {}