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

Show/hide logo in updateVisualState() 

We control the visibility of almost everything else in this function,
so move the logo handling there as well.
This commit is contained in:
samhed 2016-08-25 13:21:33 +02:00 committed by Pierre Ossman
parent eeb395dc91
commit 999f1d45db
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/ui.js
View File

@ -322,8 +322,6 @@ var UI;
klass = "noVNC_status_normal"; klass = "noVNC_status_normal";
break; break;
case 'disconnected': case 'disconnected':
document.getElementById('noVNC_logo').style.display = "block";
document.getElementById('noVNC_screen').style.display = "none";
/* falls through */ /* falls through */
case 'loaded': case 'loaded':
klass = "noVNC_status_normal"; klass = "noVNC_status_normal";
@ -372,6 +370,8 @@ var UI;
document.getElementById('noVNC_setting_repeaterID').disabled = connected; document.getElementById('noVNC_setting_repeaterID').disabled = connected;
if (connected) { if (connected) {
document.getElementById('noVNC_logo').style.display = "none";
document.getElementById('noVNC_screen').style.display = "inline";
UI.updateViewClip(); UI.updateViewClip();
UI.setMouseButton(1); UI.setMouseButton(1);
document.getElementById('noVNC_clipboard_button').style.display = "inline"; document.getElementById('noVNC_clipboard_button').style.display = "inline";
@ -379,6 +379,8 @@ var UI;
document.getElementById('noVNC_extra_keys').style.display = ""; document.getElementById('noVNC_extra_keys').style.display = "";
document.getElementById('noVNC_sendCtrlAltDel_button').style.display = "inline"; document.getElementById('noVNC_sendCtrlAltDel_button').style.display = "inline";
} else { } else {
document.getElementById('noVNC_logo').style.display = "block";
document.getElementById('noVNC_screen').style.display = "none";
UI.hideMouseButton(); UI.hideMouseButton();
document.getElementById('noVNC_clipboard_button').style.display = "none"; document.getElementById('noVNC_clipboard_button').style.display = "none";
document.getElementById('noVNC_keyboard_button').style.display = "none"; document.getElementById('noVNC_keyboard_button').style.display = "none";
@ -776,8 +778,6 @@ var UI;
//Close dialog. //Close dialog.
setTimeout(UI.setBarPosition, 100); setTimeout(UI.setBarPosition, 100);
document.getElementById('noVNC_logo').style.display = "none";
document.getElementById('noVNC_screen').style.display = "inline";
}, },
disconnect: function() { disconnect: function() {
@ -787,9 +787,6 @@ var UI;
// Restore the callback used for initial resize // Restore the callback used for initial resize
UI.rfb.set_onFBUComplete(UI.initialResize); UI.rfb.set_onFBUComplete(UI.initialResize);
document.getElementById('noVNC_logo').style.display = "block";
document.getElementById('noVNC_screen').style.display = "none";
// Don't display the connection settings until we're actually disconnected // Don't display the connection settings until we're actually disconnected
}, },