Magic CLOSE_NORMAL

See https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent WebSocket defines 1000 as CLOSE_NORMAL, SockJS uses it without a name and doesn't provide one for us, so for now we define our own
OctoPrint · May 11, 2015 · c8b8bcb · c8b8bcb
1 parent 91bdffa
commit c8b8bcb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js
@@ -33,8 +33,7 @@ function DataUpdater(allViewModels) {
     };
 
     self._onclose = function(e) {
-        if (e.code == 1000) {
-            // it was us calling close
+        if (e.code == SOCKJS_CLOSE_NORMAL) {
             return;
         }
         if (self._autoReconnectTrial >= self._autoReconnectDialogIndex) {

diff --git a/src/octoprint/templates/initscript.jinja2 b/src/octoprint/templates/initscript.jinja2
@@ -20,6 +20,8 @@
 
     var SOCKJS_URI = "{{ url_for('index') }}" + "sockjs";
     var SOCKJS_DEBUG = CONFIG_DEBUG;
+    // sockjs should define CLOSE_NORMAL for us, but they don't (from ws spec)
+    var SOCKJS_CLOSE_NORMAL = 1000
 
     var UI_API_KEY = "{{ uiApiKey }}";
     var VERSION = "{{ version }}";