fix a sorting bug and correct agg switch id problem
diff --git a/web/ons-demo/js/app.js b/web/ons-demo/js/app.js
index 3eb2e7d..de6e294 100644
--- a/web/ons-demo/js/app.js
+++ b/web/ons-demo/js/app.js
@@ -71,7 +71,7 @@
// record the angle for the agg switch layout
var dpid = s.dpid.split(':');
- dpid[7] = '00';
+ dpid[7] = '01'; // the last component of the agg switch is always '01'
var aggdpid = dpid.join(':');
var aggRange = aggRanges[aggdpid];
if (!aggRange) {
@@ -90,11 +90,7 @@
// rings[1].angles[i] = k * i;
var range = aggRanges[s.dpid];
- if (range) {
- rings[1].angles[i] = (range.min + range.max)/2;
- } else {
- rings[1].angles[i] = 0;
- }
+ rings[1].angles[i] = (range.min + range.max)/2;
});
// arrange core switches at equal increments
diff --git a/web/ons-demo/js/model.js b/web/ons-demo/js/model.js
index 82e66c1..2386e36 100644
--- a/web/ons-demo/js/model.js
+++ b/web/ons-demo/js/model.js
@@ -17,7 +17,7 @@
var bB = b.dpid.split(':');
for (var i=0; i<aA.length; i+=1) {
if (aA[i] != bB[i]) {
- return aA[i] - bB[i];
+ return parseInt(aA[i], 16) - parseInt(bB[i], 16);
}
}
return 0;