diff options
author | Samuel Mannehed <samuel@cendio.se> | 2018-08-16 15:49:26 +0200 |
---|---|---|
committer | Samuel Mannehed <samuel@cendio.se> | 2018-08-16 15:52:21 +0200 |
commit | c995c0863edd45a49927b84637e3faa28b17f34b (patch) | |
tree | 5cc396699f9c2a6765021bdac9c5b034fc890f84 | |
parent | 2c0b14663044de1e3465a49c50706c10f2d73794 (diff) | |
download | novnc-c995c0863edd45a49927b84637e3faa28b17f34b.tar.gz |
Revert "Handle if desktopName isn't set.."
This reverts commit 22000b93d5aa3d12823e7440533e8eb25739e9c0. The
'desktopname' and the 'connect' events are dispatched by us in RFB and
are thus serial.
-rw-r--r-- | app/ui.js | 10 | ||||
-rw-r--r-- | vnc_lite.html | 12 |
2 files changed, 5 insertions, 17 deletions
@@ -1074,14 +1074,10 @@ const UI = { UI.inhibit_reconnect = false; let msg; - if (UI.desktopName !== '') { - if (UI.getSetting('encrypt')) { - msg = _("Connected (encrypted) to ") + UI.desktopName; - } else { - msg = _("Connected (unencrypted) to ") + UI.desktopName; - } + if (UI.getSetting('encrypt')) { + msg = _("Connected (encrypted) to ") + UI.desktopName; } else { - msg = _("Connected"); + msg = _("Connected (unencrypted) to ") + UI.desktopName; } UI.showStatus(msg); UI.updateVisualState('connected'); diff --git a/vnc_lite.html b/vnc_lite.html index 9f766fb..e5ab3c2 100644 --- a/vnc_lite.html +++ b/vnc_lite.html @@ -131,19 +131,11 @@ function connected(e) { document.getElementById('sendCtrlAltDelButton').disabled = false; - - let encryption; if (WebUtil.getConfigVar('encrypt', (window.location.protocol === "https:"))) { - encryption = "unencrypted"; - } else { - encryption = "encrypted"; - } - - if (desktopName) { - status("Connected (" + encryption + ") to " + desktopName, "normal"); + status("Connected (encrypted) to " + desktopName, "normal"); } else { - status("Connected (" + encryption + ")", "normal"); + status("Connected (unencrypted) to " + desktopName, "normal"); } } |