From b52e8f74e255e42e9364c1503295394ea2c9f3f2 Mon Sep 17 00:00:00 2001
From: shortcutme <hello@noloop.me>
Date: Sat, 27 Aug 2016 11:52:44 +0200
Subject: [PATCH] Rev1428, Don't display websocket error when navigating away

---
 src/Config.py               | 2 +-
 src/Ui/media/Wrapper.coffee | 2 ++
 src/Ui/media/all.js         | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Config.py b/src/Config.py
index 3f7d0a44..498dbd26 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -8,7 +8,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.4.0"
-        self.rev = 1427
+        self.rev = 1428
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"
diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee
index 322a1466..1f8771bb 100644
--- a/src/Ui/media/Wrapper.coffee
+++ b/src/Ui/media/Wrapper.coffee
@@ -297,6 +297,8 @@ class Wrapper
 			@sendInner {"cmd": "wrapperClosedWebsocket"} # Send to inner frame
 			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.")
+			else if e and e.code == 1001 and e.wasClean == true  # Navigating to other page
+				return
 			else if not @ws_error
 				@ws_error = @notifications.add("connection", "error", "Connection with <b>UiServer Websocket</b> was lost. Reconnecting...")
 		), 1000
diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js
index 2b2996a9..9b2082e8 100644
--- a/src/Ui/media/all.js
+++ b/src/Ui/media/all.js
@@ -632,7 +632,6 @@ jQuery.extend( jQuery.easing,
 }).call(this);
 
 
-
 /* ---- src/Ui/media/Notifications.coffee ---- */
 
 
@@ -1180,6 +1179,8 @@ jQuery.extend( jQuery.easing,
           });
           if (e && e.code === 1000 && e.wasClean === false) {
             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) {
             return _this.ws_error = _this.notifications.add("connection", "error", "Connection with <b>UiServer Websocket</b> was lost. Reconnecting...");
           }
@@ -1377,4 +1378,4 @@ jQuery.extend( jQuery.easing,
 
   window.wrapper = new Wrapper(ws_url);
 
-}).call(this);
\ No newline at end of file
+}).call(this);