Release 1.4.5

socketio · Jan 26, 2016 · 5fe7373 · 5fe7373
1 parent 4ccc34b
commit 5fe7373
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/History.md b/History.md
@@ -1,4 +1,14 @@
 
+1.4.5 / 2016-01-26
+==================
+
+  * fix `NativeScript` support
+
+1.4.4 / 2016-01-10
+==================
+
+  * bump `engine.io-client`
+
 1.4.3 / 2016-01-08
 ==================
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socket.io-client",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "keywords": [
     "realtime",
     "framework",
@@ -35,7 +35,7 @@
     "has-cors": "1.1.0",
     "istanbul": "0.4.2",
     "mocha": "2.3.4",
-    "socket.io": "1.4.4",
+    "socket.io": "1.4.5",
     "text-blob-builder": "0.0.1",
     "uglify-js": "2.6.1",
     "zuul": "3.9.0",

diff --git a/socket.io.js b/socket.io.js
@@ -1883,11 +1883,16 @@ var BrowserWebSocket = global.WebSocket || global.MozWebSocket;
 
 /**
  * Get either the `WebSocket` or `MozWebSocket` globals
- * in the browser or the WebSocket-compatible interface
- * exposed by `ws` for Node environment.
+ * in the browser or try to resolve WebSocket-compatible
+ * interface exposed by `ws` for Node-like environment.
  */
 
-var WebSocket = BrowserWebSocket || (typeof window !== 'undefined' ? null : _dereq_('ws'));
+var WebSocket = BrowserWebSocket;
+if (!WebSocket && typeof window === 'undefined') {
+  try {
+    WebSocket = _dereq_('ws');
+  } catch (e) { }
+}
 
 /**
  * Module exports.