pr updates

weaveworks · Mar 8, 2017 · 16fa556 · 16fa556
1 parent 63f168b
commit 16fa556
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/client/app/scripts/utils/router-utils.js b/client/app/scripts/utils/router-utils.js
@@ -98,7 +98,7 @@ export function getRouter(dispatch, initialState) {
   if (storageState) {
     window.location.hash = `!/state/${storageState}`;
     const parsedState = JSON.parse(decodeURL(storageState));
-    mergedState = Object.assign(initialState, parsedState);
+    mergedState = { ...initialState, ...parsedState };
   }
 
   page('/', () => {

diff --git a/client/app/scripts/utils/web-api-utils.js b/client/app/scripts/utils/web-api-utils.js
@@ -363,7 +363,10 @@ export function teardownWebsockets() {
   if (socket) {
     socket.onerror = null;
     socket.onclose = null;
+    socket.onmessage = null;
+    socket.onopen = null;
     socket.close();
+    socket = null;
     currentOptions = null;
   }
 }