summaryrefslogtreecommitdiff
path: root/app/ui.js
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2020-05-05 12:14:49 +0200
committerPierre Ossman <ossman@cendio.se>2020-05-05 12:43:04 +0200
commit42e3b03fa8af4373a36c73af2a207eca8490f6ac (patch)
tree9db48be309424951819beeac1435a2843196cb0e /app/ui.js
parent776cda5dc4f34ed2a4fa30654cabd489ef18a241 (diff)
downloadnovnc-42e3b03fa8af4373a36c73af2a207eca8490f6ac.tar.gz
Consistently close dialogs on connect/disconnect
This was done a bit arbitrarily before which could easily miss things, end up in the wrong state and not trigger animations correctly. This reverts commit c12e5b2b544aff6f662c7f61f82ce40d132e14df and fixes things in a different way.
Diffstat (limited to 'app/ui.js')
-rw-r--r--app/ui.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/ui.js b/app/ui.js
index 61ddffe..7207b2f 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -445,7 +445,9 @@ const UI = {
UI.keepControlbar();
}
- // State change closes the password dialog
+ // State change closes dialogs as they may not be relevant
+ // anymore
+ UI.closeAllPanels();
document.getElementById('noVNC_credentials_dlg')
.classList.remove('noVNC_open');
},
@@ -1016,7 +1018,6 @@ const UI = {
return;
}
- UI.closeAllPanels();
UI.closeConnectPanel();
UI.updateVisualState('connecting');
@@ -1054,7 +1055,6 @@ const UI = {
},
disconnect() {
- UI.closeAllPanels();
UI.rfb.disconnect();
UI.connected = false;