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

Revert "Handle if desktopName isn't set.." 

This reverts commit 22000b93d5. The
'desktopname' and the 'connect' events are dispatched by us in RFB and
are thus serial.
This commit is contained in:
Samuel Mannehed 2018-08-16 15:49:26 +02:00
parent 2c0b146630
commit c995c0863e
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/ui.js
View File

@ -1074,14 +1074,10 @@ const UI = {
UI.inhibit_reconnect = false; UI.inhibit_reconnect = false;
let msg; let msg;
if (UI.desktopName !== '') { if (UI.getSetting('encrypt')) {
if (UI.getSetting('encrypt')) { msg = _("Connected (encrypted) to ") + UI.desktopName;
msg = _("Connected (encrypted) to ") + UI.desktopName;
} else {
msg = _("Connected (unencrypted) to ") + UI.desktopName;
}
} else { } else {
msg = _("Connected"); msg = _("Connected (unencrypted) to ") + UI.desktopName;
} }
UI.showStatus(msg); UI.showStatus(msg);
UI.updateVisualState('connected'); UI.updateVisualState('connected');

12
vnc_lite.html
View File

@ -131,19 +131,11 @@
function connected(e) { function connected(e) {
document.getElementById('sendCtrlAltDelButton').disabled = false; document.getElementById('sendCtrlAltDelButton').disabled = false;
let encryption;
if (WebUtil.getConfigVar('encrypt', if (WebUtil.getConfigVar('encrypt',
(window.location.protocol === "https:"))) { (window.location.protocol === "https:"))) {
encryption = "unencrypted"; status("Connected (encrypted) to " + desktopName, "normal");
} else { } else {
encryption = "encrypted"; status("Connected (unencrypted) to " + desktopName, "normal");
}
if (desktopName) {
status("Connected (" + encryption + ") to " + desktopName, "normal");
} else {
status("Connected (" + encryption + ")", "normal");
} }
} }