Merge branch 'r2.2.1'

pusher · May 28, 2014 · 4de31e2 · 4de31e2
2 parents d691a78 + 8eabb31
commit 4de31e2
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 42 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.1 (2014-05-28)
+
+[FIXED] Exception triggered by ping being sent when disconnected
+
 ## 2.2.0 (2014-04-14)
 
 No changes since 2.2.0-rc3, just changed the version number.

diff --git a/JFile b/JFile
@@ -7,7 +7,7 @@ target_dir './dist'
 
 src_dir './src'
 
-version '2.2.0'
+version '2.2.1'
 
 bundle 'pusher.js' do
   license 'pusher-licence.js'

diff --git a/dist/flashfallback.js b/dist/flashfallback.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.0
+ * Pusher JavaScript Library v2.2.1
  * http://pusherapp.com/
  *
  * Copyright 2011, Pusher

diff --git a/dist/flashfallback.min.js b/dist/flashfallback.min.js
diff --git a/dist/pusher.js b/dist/pusher.js
@@ -1,8 +1,8 @@
 /*!
- * Pusher JavaScript Library v2.2.0
- * http://pusherapp.com/
+ * Pusher JavaScript Library v2.2.1
+ * http://pusher.com/
  *
- * Copyright 2013, Pusher
+ * Copyright 2014, Pusher
  * Released under the MIT licence.
  */
 
@@ -626,7 +626,7 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.2.0';
+  Pusher.VERSION = '2.2.1';
   Pusher.PROTOCOL = 7;
 
   // DEPRECATED: WS connection parameters
@@ -3223,7 +3223,7 @@
     });
     Pusher.Network.bind("offline", function() {
       self.timeline.info({ netinfo: "offline" });
-      if (self.state === "connected") {
+      if (self.connection) {
         self.sendActivityCheck();
       }
     });
@@ -3321,7 +3321,6 @@
     this.abortConnecting();
     this.clearRetryTimer();
     this.clearUnavailableTimer();
-    this.stopActivityCheck();
     if (this.connection) {
       var connection = this.abandonConnection();
       connection.close();
@@ -3501,6 +3500,7 @@
     if (!this.connection) {
       return;
     }
+    this.stopActivityCheck();
     for (var event in this.connectionCallbacks) {
       this.connection.unbind(event, this.connectionCallbacks[event]);
     }

diff --git a/dist/pusher.min.js b/dist/pusher.min.js
diff --git a/dist/xdr.js b/dist/xdr.js
@@ -1,8 +1,8 @@
 /*!
- * Pusher JavaScript Library v2.2.0
- * http://pusherapp.com/
+ * Pusher JavaScript Library v2.2.1
+ * http://pusher.com/
  *
- * Copyright 2013, Pusher
+ * Copyright 2014, Pusher
  * Released under the MIT licence.
  */
 

diff --git a/dist/xdr.min.js b/dist/xdr.min.js
diff --git a/dist/xhr.js b/dist/xhr.js
@@ -1,8 +1,8 @@
 /*!
- * Pusher JavaScript Library v2.2.0
- * http://pusherapp.com/
+ * Pusher JavaScript Library v2.2.1
+ * http://pusher.com/
  *
- * Copyright 2013, Pusher
+ * Copyright 2014, Pusher
  * Released under the MIT licence.
  */
 

diff --git a/dist/xhr.min.js b/dist/xhr.min.js
diff --git a/spec/javascripts/unit/connection/connection_manager_spec.js b/spec/javascripts/unit/connection/connection_manager_spec.js
@@ -276,7 +276,7 @@ describe("ConnectionManager", function() {
       handshake = {
         action: "connected",
         connection: connection,
-        activityTimeout: 999999
+        activityTimeout: 500
       };
       strategy._callback(null, handshake);
     });
@@ -371,8 +371,7 @@ describe("ConnectionManager", function() {
       it("should clean up the activity check", function() {
         jasmine.Clock.tick(10000);
         // if activity check had worked, it would have sent a ping message
-        expect(connection.send).not.toHaveBeenCalled();
-        expect(connection.send_event).not.toHaveBeenCalled();
+        expect(connection.ping).not.toHaveBeenCalled();
       });
     });
 
@@ -391,13 +390,13 @@ describe("ConnectionManager", function() {
 
     describe("on activity timeout", function() {
       it("should send a ping", function() {
-        jasmine.Clock.tick(3455);
+        jasmine.Clock.tick(499);
         expect(connection.ping).not.toHaveBeenCalled();
 
         jasmine.Clock.tick(1);
         expect(connection.ping).toHaveBeenCalled();
 
-        jasmine.Clock.tick(2344);
+        jasmine.Clock.tick(999);
         expect(connection.close).not.toHaveBeenCalled();
 
         connection.emit("activity");
@@ -407,7 +406,7 @@ describe("ConnectionManager", function() {
       });
 
       it("should close the connection after pong timeout", function() {
-        jasmine.Clock.tick(3456);
+        jasmine.Clock.tick(500);
         expect(connection.close).not.toHaveBeenCalled();
         jasmine.Clock.tick(2345);
         expect(connection.close).toHaveBeenCalled();