Merge pull request wilk#12 from zetsubo/master

fix null protocol argument bug
alaingilbert · Dec 17, 2014 · ecbdac7 · ecbdac7
2 parents df74ffd + 50e3fce
commit ecbdac7
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/ng-websocket.js b/ng-websocket.js
@@ -119,7 +119,16 @@
         };
 
         me.$$init = function (cfg) {
-            me.$$ws = cfg.mock ? new $$mockWebsocket(cfg.mock, $http) : new WebSocket(cfg.url, cfg.protocols);
+
+            if (cfg.mock) {
+                me.$$ws = new $$mockWebsocket(cfg.mock, $http);
+            }
+            else if (cfg.protocols) {
+                me.$$ws = new WebSocket(cfg.url, cfg.protocols);
+            }
+            else {
+                me.$$ws = new WebSocket(cfg.url);
+            }
 
             me.$$ws.onmessage = function (message) {
                 try {