RAM: " + integerFormatter.format(used) + " / " + total + "MB" +
+ return "
RAM: " + integerFormatter.format(used) + " / " + total + "MB" +
"
";
}
diff --git a/apps/routerconsole/jsp/js/ajax.js b/apps/routerconsole/jsp/js/ajax.js
index 8933f9719..6f7701945 100644
--- a/apps/routerconsole/jsp/js/ajax.js
+++ b/apps/routerconsole/jsp/js/ajax.js
@@ -35,14 +35,10 @@ function ajaxDone(url, target, refresh) {
//document.getElementByClassName("hideifdown").style.display="none";
}
- // conditionally load sidebar refreshGraph script
- var graph = document.getElementById('sb_graphcontainer');
- if (graph) {
- var js_refreshGraph = document.createElement('script');
- js_refreshGraph.type = "text/javascript";
- js_refreshGraph.src = "/js/refreshGraph.js";
- js_refreshGraph.async = true;
- document.getElementsByTagName('head')[0].appendChild(js_refreshGraph);
+ // conditionally display graph so ajax call doesn't interfere with refreshGraph.js
+ var graph = document.getElementById("sb_graphcontainer");
+ if (graph) {
+ graph.style.backgroundImage = "url(/viewstat.jsp?stat=bw.combined&periodCount=20&width=220&height=50&hideLegend=true&hideGrid=true&time=" + new Date().getTime();
}
setTimeout(function() {ajax(url, target, refresh);}, refresh);
diff --git a/history.txt b/history.txt
index 5f32fec1c..8e2255d3d 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2017-11-02 str4d
+ * Console:
+ - Sidebar:
+ - Fix erratic display of sidebar graph
+ - Add id to memory bar so we can target it for Chrome/blink display issue
+
2017-10-25 str4d
* Console:
- /graphs: