summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mannehed <samuel@cendio.se>2017-11-11 02:31:19 +0100
committerSamuel Mannehed <samuel@cendio.se>2017-11-14 15:36:12 +0100
commit689580381c9f96212213bd3dd65b94b5b4e36222 (patch)
treee260b90e2d7891f1a1373855f682a6a789d3f0c0
parentd623a029d6bc2347781d85a40b67645eec2b8300 (diff)
downloadnovnc-689580381c9f96212213bd3dd65b94b5b4e36222.tar.gz
Move UI.cancelReconnect() to related functions
-rw-r--r--app/ui.js24
1 files changed, 12 insertions, 12 deletions
diff --git a/app/ui.js b/app/ui.js
index d43df75..08ce449 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -1077,6 +1077,18 @@ var UI = {
UI.connect(null, UI.reconnect_password);
},
+ cancelReconnect: function() {
+ if (UI.reconnect_callback !== null) {
+ clearTimeout(UI.reconnect_callback);
+ UI.reconnect_callback = null;
+ }
+
+ UI.updateVisualState('disconnected');
+
+ UI.openControlbar();
+ UI.openConnectPanel();
+ },
+
connectFinished: function (e) {
UI.connected = true;
UI.inhibit_reconnect = false;
@@ -1135,18 +1147,6 @@ var UI = {
UI.showStatus(msg, 'error');
},
- cancelReconnect: function() {
- if (UI.reconnect_callback !== null) {
- clearTimeout(UI.reconnect_callback);
- UI.reconnect_callback = null;
- }
-
- UI.updateVisualState('disconnected');
-
- UI.openControlbar();
- UI.openConnectPanel();
- },
-
/* ------^-------
* /CONNECTION
* ==============