pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Magic CLOSE_NORMAL

Browse source 
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
This commit is contained in:
Mark Walker 2015-05-11 05:52:36 -07:00
parent 91bdffab33
commit c8b8bcb22e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/octoprint/static/js/app/dataupdater.js
View file

@ -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) {

2
src/octoprint/templates/initscript.jinja2
View file

@ -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 }}";