Merge pull request joewalnes#34 from uecasm/patch-2

joewalnes · joewalnes · commit b0e3cc4d5cf4 · 2014-12-16T07:55:34.000-06:00
Fix TypeError when no options provided
diff --git a/reconnecting-websocket.js b/reconnecting-websocket.js
@@ -109,6 +109,7 @@
             /** The maximum time in milliseconds to wait for a connection to succeed before closing and retrying. */
             timeoutInterval: 2000
         }
+        if (!options) { options = {}; }
 
         // Overwrite and define settings with options if they exist.
         for (var key in settings) {

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@`
`109`	`109`	`/** The maximum time in milliseconds to wait for a connection to succeed before closing and retrying. */`
`110`	`110`	`timeoutInterval: 2000`
`111`	`111`	`}`
	`112`	`+ if (!options) { options = {}; }`
`112`	`113`
`113`	`114`	`// Overwrite and define settings with options if they exist.`
`114`	`115`	`for (var key in settings) {`