From 35d0544ce050bfcb642fa40e0deb52166993d54a Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford Date: Fri, 5 May 2017 10:37:29 -0700 Subject: [PATCH] Respond to review comments - Pin `got` and `socket-io.client` - Finish removing `removeSocket`-related code --- package.json | 4 ++-- src/io/deviceManager.js | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e009cb03..b32cfb6a 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "eslint-config-scratch": "^3.1.0", "expose-loader": "0.7.3", "gh-pages": "^0.12.0", - "got": "^5.7.1", + "got": "5.7.1", "highlightjs": "^9.8.0", "htmlparser2": "3.9.2", "json": "^9.0.4", @@ -46,7 +46,7 @@ "scratch-render": "latest", "scratch-storage": "latest", "script-loader": "0.7.0", - "socket.io-client": "^1.7.3", + "socket.io-client": "1.7.3", "stats.js": "^0.17.0", "tap": "^10.2.0", "travis-after-all": "^1.4.4", diff --git a/src/io/deviceManager.js b/src/io/deviceManager.js index 90b1fd23..18e6de02 100644 --- a/src/io/deviceManager.js +++ b/src/io/deviceManager.js @@ -86,7 +86,6 @@ class DeviceOpener { * React to the socket becoming disconnected. */ onDisconnect () { - this.removeSocket(); this.clearConnectionTimeout(); this._reject('device disconnected'); } @@ -102,7 +101,6 @@ class DeviceOpener { if (this._socket.connected) { this._socket.disconnect(); } else { - this.removeSocket(); this._reject('connection attempt timed out'); } }