5
0
mirror of git://git.proxmox.com/git/novnc-pve.git synced 2025-01-23 02:04:18 +03:00

remove unused code

And store connection state in noVNC_status_state/noVNC_status_msg, so
that we can query that with the PVE VNCConsole widget.
This commit is contained in:
Dietmar Maurer 2014-06-27 10:23:30 +02:00
parent d0e9f774ef
commit 82eef9419a

View File

@ -23,26 +23,8 @@
<body style="margin: 0px;">
<div id="noVNC_screen">
<div id="noVNC_status_bar" class="noVNC_status_bar" style="margin-top: 0px; visibility: hidden; position: absolute;">
<table border=0 width="100%"><tr>
<td><div id="noVNC_status" style="position: relative; height: auto;">
Loading
</div></td>
<td width="1%"><div id="noVNC_buttons">
<input type=button value="Send CtrlAltDel"
id="sendCtrlAltDelButton">
<span id="noVNC_xvp_buttons">
<input type=button value="Shutdown"
id="xvpShutdownButton">
<input type=button value="Reboot"
id="xvpRebootButton">
<input type=button value="Reset"
id="xvpResetButton">
</span>
</div>
</td>
</tr></table>
</div>
<div id="noVNC_status_state" style="margin-top: 0px; visibility: hidden; position: absolute;"></div>
<div id="noVNC_status_msg" style="margin-top: 0px; visibility: hidden; position: absolute;"></div>
<canvas id="noVNC_canvas" width="640px" height="20px">
Canvas not supported.
</canvas>
@ -61,111 +43,48 @@
var rfb;
function passwordRequired(rfb) {
var msg;
msg = '<form onsubmit="return setPassword();"';
msg += ' style="margin-bottom: 0px">';
msg += 'Password Required: ';
msg += '<input type=password size=10 id="password_input" class="noVNC_status">';
msg += '<\/form>';
$D('noVNC_status_bar').setAttribute("class", "noVNC_status_warn");
$D('noVNC_status').innerHTML = msg;
$D('noVNC_status_state').innerHTML = "pwrequest";
$D('noVNC_status_msg').innerHTML = "needs password";
}
function setPassword() {
rfb.sendPassword($D('password_input').value);
//rfb.sendPassword($D('password_input').value);
return false;
}
function sendCtrlAltDel() {
rfb.sendCtrlAltDel();
return false;
}
function xvpShutdown() {
rfb.xvpShutdown();
return false;
}
function xvpReboot() {
rfb.xvpReboot();
return false;
}
function xvpReset() {
rfb.xvpReset();
return false;
}
function updateState(rfb, state, oldstate, msg) {
var s, sb, cad, level;
s = $D('noVNC_status');
sb = $D('noVNC_status_bar');
cad = $D('sendCtrlAltDelButton');
switch (state) {
case 'failed': level = "error"; break;
case 'fatal': level = "error"; break;
case 'normal': level = "normal"; break;
case 'disconnected': level = "normal"; break;
case 'loaded': level = "normal"; break;
default: level = "warn"; break;
}
if (state === "normal") {
cad.disabled = false;
} else {
cad.disabled = true;
function updateState(rfb, state, oldstate, msg) {
var sm, ss;
sm = $D('noVNC_status_msg');
ss = $D('noVNC_status_state');
if (state !== "normal") {
xvpInit(0);
}
if (typeof(msg) !== 'undefined') {
sb.setAttribute("class", "noVNC_status_" + level);
s.innerHTML = msg;
}
ss.innerHTML = state;
if (typeof(msg) !== 'undefined') {
sm.innerHTML = msg;
}
}
function xvpInit(ver) {
var xvpbuttons;
xvpbuttons = $D('noVNC_xvp_buttons');
if (ver >= 1) {
xvpbuttons.style.display = 'inline';
} else {
xvpbuttons.style.display = 'none';
}
// do nothing
}
window.onscriptsload = function () {
var host, port, password, path, token;
$D('sendCtrlAltDelButton').style.display = "inline";
$D('sendCtrlAltDelButton').onclick = sendCtrlAltDel;
$D('xvpShutdownButton').onclick = xvpShutdown;
$D('xvpRebootButton').onclick = xvpReboot;
$D('xvpResetButton').onclick = xvpReset;
WebUtil.init_logging(WebUtil.getQueryVar('logging', 'warn'));
document.title = unescape(WebUtil.getQueryVar('title', 'noVNC'));
// By default, use the host and port of server that served this file
host = WebUtil.getQueryVar('host', window.location.hostname);
port = WebUtil.getQueryVar('port', window.location.port);
// if port == 80 (or 443) then it won't be present and should be
// set manually
if (!port) {
if (window.location.protocol.substring(0,5) == 'https') {
port = 443;
}
else if (window.location.protocol.substring(0,4) == 'http') {
port = 80;
}
}
// If a token variable is passed in, set the parameter in a cookie.
// This is used by nova-novncproxy.
token = WebUtil.getQueryVar('token', null);
if (token) {
WebUtil.createCookie('token', token, 1)
}
password = WebUtil.getQueryVar('password', '');
path = WebUtil.getQueryVar('path', 'websockify');
if ((!host) || (!port)) {
updateState('failed',
"Must specify host and port in URL");
updateState('failed', "Must specify host and port in URL");
return;
}
@ -185,13 +104,6 @@
$D("noVNC_screen").onmouseover = function(e) {
window.focus();
};
// .mouseout(function() {
// rfb.get_keyboard().set_focused(false);
// }).mouseover(function() {
// rfb.get_keyboard().set_focused(true);
// });
};
</script>
</body>