Merge pull request #233 from farwayer/websocket-react-native

wangmengyan95 · wangmengyan95 · commit bad4260e4472 · 2016-03-21T10:27:21.000-07:00
Fix getting WebSocket implemetation in react-native
diff --git a/src/LiveQueryClient.js b/src/LiveQueryClient.js
@@ -321,15 +321,13 @@ export default class LiveQueryClient extends events.EventEmitter {
   }
 
   _getWebSocketImplementation(): any {
-    let WebSocketImplementation;
     if (process.env.PARSE_BUILD === 'node') {
-      WebSocketImplementation = require('ws');
+      return require('ws');
     } else if (process.env.PARSE_BUILD === 'browser') {
-      if (window.WebSocket) {
-        WebSocketImplementation = WebSocket;
-      }
+      return typeof WebSocket === 'function' ? WebSocket : null;
+    } else if (process.env.PARSE_BUILD === 'react-native') {
+      return WebSocket;
     }
-    return WebSocketImplementation;
   }
 
   // ensure we start with valid state if connect is called again after close

Original file line number	Diff line number	Diff line change
`@@ -321,15 +321,13 @@ export default class LiveQueryClient extends events.EventEmitter {`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`_getWebSocketImplementation(): any {`
`324`		`- let WebSocketImplementation;`
`325`	`324`	`if (process.env.PARSE_BUILD === 'node') {`
`326`		`- WebSocketImplementation = require('ws');`
	`325`	`+ return require('ws');`
`327`	`326`	`} else if (process.env.PARSE_BUILD === 'browser') {`
`328`		`- if (window.WebSocket) {`
`329`		`- WebSocketImplementation = WebSocket;`
`330`		`- }`
	`327`	`+ return typeof WebSocket === 'function' ? WebSocket : null;`
	`328`	`+ } else if (process.env.PARSE_BUILD === 'react-native') {`
	`329`	`+ return WebSocket;`
`331`	`330`	`}`
`332`		`- return WebSocketImplementation;`
`333`	`331`	`}`
`334`	`332`
`335`	`333`	`// ensure we start with valid state if connect is called again after close`