GUI -- Fix default host type (back to endstation)
reduced pane delays to 500ms Change-Id: Id1ac1991894d4ece1edfaef6ee5a5b217f8860f1
Showing
3 changed files
with
6 additions
and
13 deletions
| ... | @@ -32,7 +32,7 @@ | ... | @@ -32,7 +32,7 @@ |
| 32 | // Config variables | 32 | // Config variables |
| 33 | var w = '100%', | 33 | var w = '100%', |
| 34 | h = 200, | 34 | h = 200, |
| 35 | - fade = 750, | 35 | + fade = 500, |
| 36 | showFor = 2000, | 36 | showFor = 2000, |
| 37 | vb = '-200 -' + (h/2) + ' 400 ' + h, | 37 | vb = '-200 -' + (h/2) + ' 400 ' + h, |
| 38 | xpad = 20, | 38 | xpad = 20, | ... | ... |
| ... | @@ -32,7 +32,7 @@ | ... | @@ -32,7 +32,7 @@ |
| 32 | // Config variables | 32 | // Config variables |
| 33 | var w = '100%', | 33 | var w = '100%', |
| 34 | h = '80%', | 34 | h = '80%', |
| 35 | - fade = 750, | 35 | + fade = 500, |
| 36 | vb = '-220 -220 440 440', | 36 | vb = '-220 -220 440 440', |
| 37 | paneW = 400, | 37 | paneW = 400, |
| 38 | paneH = 340, | 38 | paneH = 340, | ... | ... |
| ... | @@ -175,6 +175,8 @@ | ... | @@ -175,6 +175,8 @@ |
| 175 | }, | 175 | }, |
| 176 | webSock, | 176 | webSock, |
| 177 | sid = 0, | 177 | sid = 0, |
| 178 | + deviceLabelCount = 2, | ||
| 179 | + hostLabelCount = 2, | ||
| 178 | deviceLabelIndex = 0, | 180 | deviceLabelIndex = 0, |
| 179 | hostLabelIndex = 0, | 181 | hostLabelIndex = 0, |
| 180 | selections = {}, | 182 | selections = {}, |
| ... | @@ -355,7 +357,7 @@ | ... | @@ -355,7 +357,7 @@ |
| 355 | 357 | ||
| 356 | var layerLookup = { | 358 | var layerLookup = { |
| 357 | host: { | 359 | host: { |
| 358 | - host: 'pkt', // default, if host event does not define type | 360 | + endstation: 'pkt', // default, if host event does not define type |
| 359 | router: 'pkt', | 361 | router: 'pkt', |
| 360 | bgpSpeaker: 'pkt' | 362 | bgpSpeaker: 'pkt' |
| 361 | }, | 363 | }, |
| ... | @@ -1241,12 +1243,6 @@ | ... | @@ -1241,12 +1243,6 @@ |
| 1241 | node.class = 'device'; | 1243 | node.class = 'device'; |
| 1242 | node.svgClass = device.online ? svgCls + ' online' : svgCls; | 1244 | node.svgClass = device.online ? svgCls + ' online' : svgCls; |
| 1243 | positionNode(node); | 1245 | positionNode(node); |
| 1244 | - | ||
| 1245 | - // cache label array length | ||
| 1246 | - // TODO: need a uiConfig event from the server to set things | ||
| 1247 | - // like device labels count, host labels count, etc. | ||
| 1248 | - // The current method (here) is a little fragile | ||
| 1249 | - network.deviceLabelCount = device.labels.length; | ||
| 1250 | return node; | 1246 | return node; |
| 1251 | } | 1247 | } |
| 1252 | 1248 | ||
| ... | @@ -1257,13 +1253,10 @@ | ... | @@ -1257,13 +1253,10 @@ |
| 1257 | // Augment as needed... | 1253 | // Augment as needed... |
| 1258 | node.class = 'host'; | 1254 | node.class = 'host'; |
| 1259 | if (!node.type) { | 1255 | if (!node.type) { |
| 1260 | - node.type = 'host'; | 1256 | + node.type = 'endstation'; |
| 1261 | } | 1257 | } |
| 1262 | node.svgClass = 'node host ' + node.type; | 1258 | node.svgClass = 'node host ' + node.type; |
| 1263 | positionNode(node); | 1259 | positionNode(node); |
| 1264 | - | ||
| 1265 | - // cache label array length | ||
| 1266 | - network.hostLabelCount = host.labels.length; | ||
| 1267 | return node; | 1260 | return node; |
| 1268 | } | 1261 | } |
| 1269 | 1262 | ... | ... |
-
Please register or login to post a comment