oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev1428, Don't display websocket error when navigating away

Browse source
This commit is contained in:
shortcutme 2016-08-27 11:52:44 +02:00
parent 887a07c3fb
commit b52e8f74e2
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -8,7 +8,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.4.0" self.version = "0.4.0"
self.rev = 1427 self.rev = 1428
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

2
src/Ui/media/Wrapper.coffee
View file

@ -297,6 +297,8 @@ class Wrapper
@sendInner {"cmd": "wrapperClosedWebsocket"} # Send to inner frame @sendInner {"cmd": "wrapperClosedWebsocket"} # Send to inner frame
if e and e.code == 1000 and e.wasClean == false # Server error please reload page if e and e.code == 1000 and e.wasClean == false # Server error please reload page
@ws_error = @notifications.add("connection", "error", "UiServer Websocket error, please reload the page.") @ws_error = @notifications.add("connection", "error", "UiServer Websocket error, please reload the page.")
else if e and e.code == 1001 and e.wasClean == true # Navigating to other page
return
else if not @ws_error else if not @ws_error
@ws_error = @notifications.add("connection", "error", "Connection with <b>UiServer Websocket</b> was lost. Reconnecting...") @ws_error = @notifications.add("connection", "error", "Connection with <b>UiServer Websocket</b> was lost. Reconnecting...")
), 1000 ), 1000

3
src/Ui/media/all.js
View file

@ -632,7 +632,6 @@ jQuery.extend( jQuery.easing,
}).call(this); }).call(this);
/* ---- src/Ui/media/Notifications.coffee ---- */ /* ---- src/Ui/media/Notifications.coffee ---- */
@ -1180,6 +1179,8 @@ jQuery.extend( jQuery.easing,
}); });
if (e && e.code === 1000 && e.wasClean === false) { if (e && e.code === 1000 && e.wasClean === false) {
return _this.ws_error = _this.notifications.add("connection", "error", "UiServer Websocket error, please reload the page."); return _this.ws_error = _this.notifications.add("connection", "error", "UiServer Websocket error, please reload the page.");
} else if (e && e.code === 1001 && e.wasClean === true) {
} else if (!_this.ws_error) { } else if (!_this.ws_error) {
return _this.ws_error = _this.notifications.add("connection", "error", "Connection with <b>UiServer Websocket</b> was lost. Reconnecting..."); return _this.ws_error = _this.notifications.add("connection", "error", "Connection with <b>UiServer Websocket</b> was lost. Reconnecting...");
} }