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

Abstract status dialog CSS class handling

This commit is contained in:
Samuel Mannehed 2016-08-29 14:42:03 +02:00 committed by Pierre Ossman
parent c8d4402f58
commit 8d7708c82e
1 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
app/ui.js
View File

@ -308,43 +308,33 @@ var UI;
updateState: function(rfb, state, oldstate, msg) {
UI.rfb_state = state;
var klass;
var timeout;
switch (state) {
case 'failed':
case 'fatal':
klass = "noVNC_status_error";
timeout = 0; // zero means no timeout
break;
case 'normal':
klass = "noVNC_status_normal";
break;
case 'disconnected':
/* falls through */
case 'loaded':
klass = "noVNC_status_normal";
break;
case 'password':
UI.toggleConnectPanel();
document.getElementById('noVNC_connect_button').value = "Send Password";
document.getElementById('noVNC_connect_button').onclick = UI.setPassword;
document.getElementById('noVNC_setting_password').focus();
klass = "noVNC_status_warn";
break;
default:
klass = "noVNC_status_warn";
break;
}
if (typeof(msg) !== 'undefined') {
document.getElementById('noVNC_status')
.classList.remove("noVNC_status_normal",
"noVNC_status_warn",
"noVNC_status_error");
document.getElementById('noVNC_status').classList.add(klass);
UI.showStatus(msg, timeout);
switch (state) {
case 'failed':
case 'fatal':
// zero means no timeout
UI.showStatus(msg, 'error', 0);
break;
case 'normal':
/* falls through */
case 'disconnected':
case 'loaded':
UI.showStatus(msg, 'normal');
break;
case 'password':
UI.toggleConnectPanel();
document.getElementById('noVNC_connect_button').value = "Send Password";
document.getElementById('noVNC_connect_button').onclick = UI.setPassword;
document.getElementById('noVNC_setting_password').focus();
UI.showStatus(msg, 'warn');
break;
default:
UI.showStatus(msg, 'warn');
break;
}
}
UI.updateVisualState();
@ -434,11 +424,34 @@ var UI;
//Util.Debug("<< updateVisualState");
},
showStatus: function(text, time) {
showStatus: function(text, status_type, time) {
var statusElem = document.getElementById('noVNC_status');
clearTimeout(UI.statusTimeout);
if (typeof status_type === 'undefined') {
status_type = 'normal';
}
statusElem.classList.remove("noVNC_status_normal",
"noVNC_status_warn",
"noVNC_status_error");
switch (status_type) {
case 'warning':
case 'warn':
statusElem.classList.add("noVNC_status_warn");
break;
case 'error':
statusElem.classList.add("noVNC_status_error");
break;
case 'normal':
case 'info':
default:
statusElem.classList.add("noVNC_status_normal");
break;
}
statusElem.innerHTML = text;
statusElem.classList.add("noVNC_open");