Update the Pusher JS client to version 2.2.1.

tristandunn · May 29, 2014 · 15db9d4 · 15db9d4
1 parent 3a25db5
commit 15db9d4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -6,6 +6,7 @@
 * Treat socket_id as a string to match Pusher. (Tristan Dunn, Adrien Jarthon)
 * Add verbose logging. (Tristan Dunn)
 * Miscellaneous clean up. (Tristan Dunn)
+* Update the Pusher JS client to version 2.2.1. (Tristan Dunn)
 * Update dependencies. (Tristan Dunn)
 
 ## 0.14.0 — February 19th, 2014

diff --git a/...public/javascripts/vendor/pusher-2.2.0.js → ...public/javascripts/vendor/pusher-2.2.1.js b/...public/javascripts/vendor/pusher-2.2.0.js → ...public/javascripts/vendor/pusher-2.2.1.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/features/support/application/views/index.erb b/features/support/application/views/index.erb
@@ -13,7 +13,7 @@
   <ul></ul>
 </section>
 
-<script src="/javascripts/vendor/pusher-2.2.0.js"></script>
+<script src="/javascripts/vendor/pusher-2.2.1.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", function() {
   // Create the client instance using the PusherFake server.