luci-app-vnstat2: correctness fixes

Signed-off-by: Paul Donald <redacted>

diff --git a/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js b/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js
index d546309f0e8cab63f5217e4bde1384738b35b27a..a5ec60d48386872c4ef3d83d9068fb633815aca1 100644 (file)
--- a/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js
+++ b/applications/luci-app-vnstat2/htdocs/luci-static/resources/view/vnstat2/graphs.js
@@ -8,9 +8,22 @@
 'require uci';
 'require rpc';
 
-var RefreshIfaces = "";
+var RefreshIfaces = [];
 var RefreshTabs = ['s', 't', '5', 'h', 'd', 'm', 'y'];
 
+function setBlobImage(srcImg, blob) {
+       const prev = srcImg.src;
+       const next = URL.createObjectURL(blob);
+
+       srcImg.onload = function() {
+               if (prev && prev.startsWith('blob:'))
+                       URL.revokeObjectURL(prev);
+               srcImg.onload = null;
+       };
+
+       srcImg.src = next;
+}
+
 const callServiceList = rpc.declare({
        object: 'service',
        method: 'list',
@@ -24,7 +37,9 @@ function RefreshGraphs() {
        RefreshTabs.forEach(function (id) {
                RefreshIfaces.forEach(function (iface) {
                        fs.exec_direct('/usr/bin/vnstati', [ '-' + id, '-i', iface, '-o', '-' ], 'blob').then(function(res) {
-                               document.getElementById('graph_' + id + '_' + iface).src = URL.createObjectURL(res);
+                               var img = document.getElementById('graph_' + id + '_' + iface);
+                               if (img)
+                                       setBlobImage(img, res);
                        });
                });
        });
@@ -74,7 +89,7 @@ return view.extend({
                ifaces.forEach(function(iface) {
                        fs.exec_direct('/usr/bin/vnstati', [ '-'+style, '-i', iface, '-o', '-' ], 'blob').then(function(res) {
                                var img = tab.querySelector('img[data-iface="%s"]'.format(iface));
-                               img.src = URL.createObjectURL(res);
+                               setBlobImage(img, res);
                                img.alt = _('Could not load graph, no data available: ') + iface;
                                img.align = 'middle';
                                img.style.visibility = 'visible';