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

Use page host:port as default for WebSocket host/port.

This commit is contained in:
Joel Martin 2012-04-03 16:46:27 -05:00
parent 0139b2562c
commit bd96e91932
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ui.js
View File

@ -45,8 +45,8 @@ load: function() {
WebUtil.selectStylesheet(UI.getSetting('stylesheet')); WebUtil.selectStylesheet(UI.getSetting('stylesheet'));
/* Populate the controls if defaults are provided in the URL */ /* Populate the controls if defaults are provided in the URL */
UI.initSetting('host', ''); UI.initSetting('host', window.location.hostname);
UI.initSetting('port', ''); UI.initSetting('port', window.location.port);
UI.initSetting('password', ''); UI.initSetting('password', '');
UI.initSetting('encrypt', (window.location.protocol === "https:")); UI.initSetting('encrypt', (window.location.protocol === "https:"));
UI.initSetting('true_color', true); UI.initSetting('true_color', true);

9
vnc_auto.html
View File

@ -90,17 +90,14 @@
$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); // By default, use the host and port of server that served this file
port = WebUtil.getQueryVar('port', null); host = WebUtil.getQueryVar('host', window.location.hostname);
port = WebUtil.getQueryVar('port', window.location.port);
// If a token variable is passed in, set the parameter in a cookie. // If a token variable is passed in, set the parameter in a cookie.
// This is used by nova-novncproxy. // This is used by nova-novncproxy.
token = WebUtil.getQueryVar('token', null); token = WebUtil.getQueryVar('token', null);
if (token) { if (token) {
// 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) WebUtil.createCookie('token', token, 1)
} }