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

Use resolved data if gateway was already resolved (#78)

Browse source 
This is now very dirty, I think the old approach was better (although it requires a server side change)
This commit is contained in:
Marvin W 2016-12-10 11:45:21 +01:00 committed by PetaByteBoy // Milan Pässler
parent 7e6d054e98
commit 44bb8e9d3d
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/infobox/node.js
View file

@ -317,6 +317,9 @@ define(["moment", "numeral", "tablesort", "tablesort.numeric"],
if (!d) if (!d)
return null return null
if (d.node || d.id)
return d
var node = nodeDict[d.substr(0, 8)] var node = nodeDict[d.substr(0, 8)]
if (!node) if (!node)
return d return d

12
lib/proportions.js
View file

@ -155,6 +155,12 @@ define(["chroma-js", "virtual-dom", "numeral-intl", "filters/genericnode", "verc
if (d === null) if (d === null)
return null return null
if (d.node)
return d.node.nodeinfo.hostname
if (d.id)
return d.id
var n = nodeDict[d.substr(0, 8)] var n = nodeDict[d.substr(0, 8)]
if (!n) if (!n)
return d return d
@ -169,6 +175,12 @@ define(["chroma-js", "virtual-dom", "numeral-intl", "filters/genericnode", "verc
if (d === null) if (d === null)
return null return null
if (d.node)
return d.node.nodeinfo.hostname
if (d.id)
return d.id
var n = nodeDict[d.substr(0, 8)] var n = nodeDict[d.substr(0, 8)]
if (!n) if (!n)
return d return d