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

Use server side resolving only, add proper support for nexthop resolving (#81)

Browse source 
* Revert "Use resolved data if gateway was already resolved (#78)"

This reverts commit 44bb8e9d3d.

* Revert "proportions: lookup gateway name"

This reverts commit 94662cb3dc.

* Revert "infobox/node: change mac used to lookup nodes"

This reverts commit 2ca2604403.

* Revert "infobox/node: resolve nexthop and gateway from data"

This reverts commit 9e7049c9e3.

* Resolve nexthop full chain if possible

requires hopglass/hopglass-server#79

* Correctly handle sidecase when nodes on route report inconsistent gateway
This commit is contained in:
Marvin W 2017-01-07 18:43:04 +01:00 • committed by PetaByteBoy // Milan Pässler
commit 5cb88e8d06
4 changed files with 28 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/infobox/main.js
View file

@ -2,7 +2,6 @@ define(["infobox/link", "infobox/node", "infobox/location"], function (Link, Nod
return function (config, sidebar, router) {
var self = this
var el
var nodeDict
function destroy() {
if (el && el.parentNode) {
@ -34,7 +33,7 @@ define(["infobox/link", "infobox/node", "infobox/location"], function (Link, Nod
self.gotoNode = function (d) {
create()
new Node(config, el, router, d, nodeDict)
new Node(config, el, router, d)
}
self.gotoLink = function (d) {
@ -47,14 +46,6 @@ define(["infobox/link", "infobox/node", "infobox/location"], function (Link, Nod
new Location(config, el, router, d)
}
self.setData = function (d) {
nodeDict = {}
d.graph.nodes.forEach(function (d) {
nodeDict[d.id.substr(0, 8)] = d
})
}
return self
}
})