jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify nova-novncproxy related logic. 

*  Don't clobber default host/port
This commit is contained in:
Anthony Young 2012-04-03 10:34:24 -07:00
parent 4c75210a4d
commit 0139b2562c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vnc_auto.html
View File

@ -90,9 +90,20 @@
$D('sendCtrlAltDelButton').onclick = sendCtrlAltDel; $D('sendCtrlAltDelButton').onclick = sendCtrlAltDel;
document.title = unescape(WebUtil.getQueryVar('title', 'noVNC')); document.title = unescape(WebUtil.getQueryVar('title', 'noVNC'));
host = WebUtil.getQueryVar('host', null);
port = WebUtil.getQueryVar('port', null);
// If a token variable is passed in, set the parameter in a cookie.
// This is used by nova-novncproxy.
token = WebUtil.getQueryVar('token', null); token = WebUtil.getQueryVar('token', null);
host = window.location.hostname; if (token) {
port = window.location.port; // If token is set, we are using nova-novncproxy.
// Use host and port of server that served this file.
host = window.location.hostname;
port = window.location.port;
WebUtil.createCookie('token', token, 1)
}
password = WebUtil.getQueryVar('password', ''); password = WebUtil.getQueryVar('password', '');
path = WebUtil.getQueryVar('path', 'websockify'); path = WebUtil.getQueryVar('path', 'websockify');
if ((!host) || (!port)) { if ((!host) || (!port)) {
@ -110,12 +121,6 @@
'view_only': WebUtil.getQueryVar('view_only', false), 'view_only': WebUtil.getQueryVar('view_only', false),
'updateState': updateState, 'updateState': updateState,
'onPasswordRequired': passwordRequired}); 'onPasswordRequired': passwordRequired});
/* If a token variable is passed in, set the parameter in a cookie. This is
used by nova-novncproxy. */
if (token) {
WebUtil.createCookie('token', token, 1)
}
rfb.connect(host, port, password, path); rfb.connect(host, port, password, path);
}; };
</script> </script>