Merge pull request #33 from uecasm/patch-1

Tidy up events
joewalnes · Dec 16, 2014 · ee8f794 · ee8f794
2 parents b0e3cc4 + 8a5164b
commit ee8f794
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/reconnecting-websocket.js b/reconnecting-websocket.js
@@ -218,11 +218,14 @@
                 ws = null;
                 if (forcedClose) {
                     self.readyState = WebSocket.CLOSED;
-                    self.onclose(event);
                     eventTarget.dispatchEvent(generateEvent('close'));
                 } else {
                     self.readyState = WebSocket.CONNECTING;
-                    eventTarget.dispatchEvent(generateEvent('connecting'));
+                    var e = generateEvent('connecting');
+                    e.code = event.code;
+                    e.reason = event.reason;
+                    e.wasClean = event.wasClean;
+                    eventTarget.dispatchEvent(e);
                     if (!reconnectAttempt && !timedOut) {
                         if (self.debug || ReconnectingWebSocket.debugAll) {
                             console.debug('ReconnectingWebSocket', 'onclose', url);
@@ -247,7 +250,7 @@
                 if (self.debug || ReconnectingWebSocket.debugAll) {
                     console.debug('ReconnectingWebSocket', 'onerror', url, event);
                 }
-                eventTarget.dispatchEvent(generateEvent('event'));
+                eventTarget.dispatchEvent(generateEvent('error'));
             };
         }
         connect(false);