Fixed noVNC on different domains.
Ylian Saint-Hilaire committed
Aug 18, 2020 at 22:56 UTC
a22647892d0753c5f6ada0ec346a504b447f80b0
1 file changed
+1
-1
views/default.handlebars
+1
-1
@@ -2293,7 +2293,7 @@
2293
newWindow.opener = null;
2294
}
2295
} else if (message.tag == 'novnc') {
2296
- var vncurl = window.location.origin + domainUrl + 'novnc/vnc.html?ws=wss%3A%2F%2F' + window.location.host + '%2Fmeshrelay.ashx%3Fauth%3D' + message.cookie + '&show_dot=1' + (urlargs.key?('&key=' + urlargs.key):'') + '&l={{{lang}}}';
2296
+ var vncurl = window.location.origin + domainUrl + 'novnc/vnc.html?ws=wss%3A%2F%2F' + window.location.host + encodeURIComponentEx(domainUrl) + 'meshrelay.ashx%3Fauth%3D' + message.cookie + '&show_dot=1' + (urlargs.key?('&key=' + urlargs.key):'') + '&l={{{lang}}}';
2297
var node = getNodeFromId(message.nodeid);
2298
if (node != null) { vncurl += '&name=' + encodeURIComponentEx(node.name); }
2299
var newWindow = window.open(vncurl, 'mcnovnc/' + message.nodeid);