Freifunk-Troisdorf/meshviewer
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pass config object to showNodeinfo/showLink

Browse Source
This commit is contained in:
Nils Schneider 2015-03-22 12:38:07 +01:00
parent 3631aebcd3
commit 952d8dc54c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
history.js
View File

@ -152,7 +152,7 @@ function handle_data(config, map) {
}).reverse().slice(0, Math.ceil(config.longLinkPercentile * graph.length)) }).reverse().slice(0, Math.ceil(config.longLinkPercentile * graph.length))
var gotoAnything = gotoBuilder(showNodeinfo, showLinkinfo) var gotoAnything = gotoBuilder(config, showNodeinfo, showLinkinfo)
var markers = mkmap(map, newnodes, lostnodes, onlinenodes, graph, gotoAnything) var markers = mkmap(map, newnodes, lostnodes, onlinenodes, graph, gotoAnything)
@ -380,7 +380,7 @@ function showMeshstats(el, nodes) {
totalGateways + " Gateways" totalGateways + " Gateways"
} }
function showNodeinfo(d) { function showNodeinfo(config, d) {
var el = document.getElementById("nodeinfo") var el = document.getElementById("nodeinfo")
destroy() destroy()
@ -405,7 +405,10 @@ function showNodeinfo(d) {
attributeEntry(attributes, "Gateway", d.flags.gateway ? "ja" : null) attributeEntry(attributes, "Gateway", d.flags.gateway ? "ja" : null)
attributeEntry(attributes, "In der Karte", "location" in d.nodeinfo ? "ja" : "nein") attributeEntry(attributes, "In der Karte", "location" in d.nodeinfo ? "ja" : "nein")
attributeEntry(attributes, "Kontakt", dictGet(d.nodeinfo, ["owner", "contact"]))
if (config.showContact)
attributeEntry(attributes, "Kontakt", dictGet(d.nodeinfo, ["owner", "contact"]))
attributeEntry(attributes, "Hardware", dictGet(d.nodeinfo, ["hardware", "model"])) attributeEntry(attributes, "Hardware", dictGet(d.nodeinfo, ["hardware", "model"]))
attributeEntry(attributes, "Primäre MAC", dictGet(d.nodeinfo, ["network", "mac"])) attributeEntry(attributes, "Primäre MAC", dictGet(d.nodeinfo, ["network", "mac"]))
attributeEntry(attributes, "Firmware", showFirmware(d)) attributeEntry(attributes, "Firmware", showFirmware(d))
@ -536,11 +539,11 @@ function showBar(className, v) {
return span return span
} }
function showLinkinfo(d) { function showLinkinfo(config, d) {
console.log(d) console.log(d)
} }
function gotoBuilder(nodes, links) { function gotoBuilder(config, nodes, links) {
var markers = {} var markers = {}
function gotoNode(d, showMap) { function gotoNode(d, showMap) {
@ -549,7 +552,7 @@ function gotoBuilder(nodes, links) {
if (showMap && d.nodeinfo.node_id in markers) if (showMap && d.nodeinfo.node_id in markers)
markers[d.nodeinfo.node_id]() markers[d.nodeinfo.node_id]()
nodes(d) nodes(config, d)
return false return false
} }
@ -560,7 +563,7 @@ function gotoBuilder(nodes, links) {
if (showMap && linkId(d) in markers) if (showMap && linkId(d) in markers)
markers[linkId(d)]() markers[linkId(d)]()
links(d) links(config, d)
return false return false
} }