code cleanup

This commit is contained in:
YAMAMOTO Takashi 2012-11-07 14:08:29 +09:00
parent 93bb0f9508
commit c24d98138b
1 changed files with 22 additions and 15 deletions

View File

@ -49,6 +49,14 @@
var rfb; var rfb;
var buttons = [
{name: 'sendBackslashButton', onclick: function() {
rfb.sendKey(0x5C);
return false;
}},
{name: 'sendCtrlAltDelButton', onclick: sendCtrlAltDel}
];
function passwordRequired(rfb) { function passwordRequired(rfb) {
var msg; var msg;
msg = '<form onsubmit="return setPassword();"'; msg = '<form onsubmit="return setPassword();"';
@ -68,11 +76,9 @@
return false; return false;
} }
function updateState(rfb, state, oldstate, msg) { function updateState(rfb, state, oldstate, msg) {
var s, sb, bs, cad, level; var s, sb, level;
s = $D('noVNC_status'); s = $D('noVNC_status');
sb = $D('noVNC_status_bar'); sb = $D('noVNC_status_bar');
bs = $D('sendBackslashButton');
cad = $D('sendCtrlAltDelButton');
switch (state) { switch (state) {
case 'failed': level = "error"; break; case 'failed': level = "error"; break;
case 'fatal': level = "error"; break; case 'fatal': level = "error"; break;
@ -82,12 +88,14 @@
default: level = "warn"; break; default: level = "warn"; break;
} }
if (state === "normal") { var i;
bs.disabled = false; for (i = 0; i < buttons.length; i++) {
cad.disabled = false; var elem = $D(buttons[i].name);
} else { if (state === "normal") {
bs.disabled = true; elem.disabled = false;
cad.disabled = true; } else {
elem.disabled = true;
}
} }
if (typeof(msg) !== 'undefined') { if (typeof(msg) !== 'undefined') {
@ -99,13 +107,12 @@
window.onscriptsload = function () { window.onscriptsload = function () {
var host, port, password, path, token; var host, port, password, path, token;
$D('sendBackslashButton').style.display = "inline"; var i;
$D('sendBackslashButton').onclick = function() { for (i = 0; i < buttons.length; i++) {
rfb.sendKey(0x5C); var button = buttons[i];
return false; $D(button.name).style.display = "inline";
$D(button.name).onclick = button.onclick;
} }
$D('sendCtrlAltDelButton').style.display = "inline";
$D('sendCtrlAltDelButton').onclick = sendCtrlAltDel;
WebUtil.init_logging(WebUtil.getQueryVar('logging', 'warn')); WebUtil.init_logging(WebUtil.getQueryVar('logging', 'warn'));
document.title = unescape(WebUtil.getQueryVar('title', 'noVNC')); document.title = unescape(WebUtil.getQueryVar('title', 'noVNC'));