More GUI changes to use the new REST API data format
diff --git a/web/ons-demo/js/app.js b/web/ons-demo/js/app.js
index 62060fd..d2f0dd6 100644
--- a/web/ons-demo/js/app.js
+++ b/web/ons-demo/js/app.js
@@ -279,7 +279,7 @@
}
if (flow.flowId) {
- console.log('starting iperf for: ' + flow.flowId.value);
+ console.log('starting iperf for: ' + flow.flowId);
startIPerf(flow, duration, updateRate/interval);
flow.iperfDisplayInterval = setInterval(function () {
if (flow.iperfData) {
@@ -385,7 +385,7 @@
}
function clearIPerf(flow) {
- console.log('clearing iperf interval for: ' + flow.flowId.value);
+ console.log('clearing iperf interval for: ' + flow.flowId);
clearInterval(flow.iperfFetchInterval);
delete flow.iperfFetchInterval;
clearInterval(flow.iperfDisplayInterval);
diff --git a/web/ons-demo/js/controller.js b/web/ons-demo/js/controller.js
index ea2143a..d9b53c2 100644
--- a/web/ons-demo/js/controller.js
+++ b/web/ons-demo/js/controller.js
@@ -42,12 +42,12 @@
callURL(url);
},
startIPerfCmd: function (flow, duration, numSamples) {
- var flowId = parseInt(flow.flowId.value, 16);
+ var flowId = parseInt(flow.flowId, 16);
var url = '/proxy/gui/iperf/start/' + [flowId, duration, numSamples].join('/');
callURL(url)
},
getIPerfDataCmd: function (flow, cb) {
- var flowId = parseInt(flow.flowId.value, 16);
+ var flowId = parseInt(flow.flowId, 16);
var url = '/proxy/gui/iperf/rate/' + flowId;
callURL(url, cb);
}
@@ -91,4 +91,4 @@
function getIPerfData(flow, cb) {
controllerFunctions.getIPerfDataCmd(flow, cb);
-}
\ No newline at end of file
+}