Update the Pusher JS client to version 2.2.3.

tristandunn · Sep 10, 2014 · 5ee6417 · 5ee6417
1 parent 6d4d049
commit 5ee6417
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -2,6 +2,7 @@
 
 ## 1.3.0 — Unreleased
 
+* Update the Pusher JS client to version 2.2.3. (Tristan Dunn)
 * Update development and test dependencies. (Tristan Dunn)
 
 ## 1.2.0 — August 9th, 2014

diff --git a/...public/javascripts/vendor/pusher-2.2.2.js → ...public/javascripts/vendor/pusher-2.2.3.js b/...public/javascripts/vendor/pusher-2.2.2.js → ...public/javascripts/vendor/pusher-2.2.3.js
@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v2.2.2
+ * Pusher JavaScript Library v2.2.3
  * http://pusher.com/
  *
  * Copyright 2014, Pusher
@@ -626,7 +626,7 @@
 }).call(this);
 
 ;(function() {
-  Pusher.VERSION = '2.2.2';
+  Pusher.VERSION = '2.2.3';
   Pusher.PROTOCOL = 7;
 
   // DEPRECATED: WS connection parameters
@@ -678,7 +678,8 @@
       }]],
       [":def", "sockjs_options", {
         hostUnencrypted: config.httpHost + ":" + config.httpPort,
-        hostEncrypted: config.httpHost + ":" + config.httpsPort
+        hostEncrypted: config.httpHost + ":" + config.httpsPort,
+        httpPath: config.httpPath
       }],
       [":def", "timeouts", {
         loop: true,
@@ -3918,7 +3919,7 @@
 
   Pusher.Channel.Authorizer.prototype = {
     composeQuery: function(socketId) {
-      var query = '&socket_id=' + encodeURIComponent(socketId) +
+      var query = 'socket_id=' + encodeURIComponent(socketId) +
         '&channel_name=' + encodeURIComponent(this.channel.name);
 
       for(var i in this.authOptions.params) {
@@ -3999,6 +4000,7 @@
       script.src = this.options.authEndpoint +
         '?callback=' +
         encodeURIComponent(callback_name) +
+        '&' +
         this.composeQuery(socketId);
 
       var head = document.getElementsByTagName("head")[0] || document.documentElement;

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.2.js"></script>
+<script src="/javascripts/vendor/pusher-2.2.3.js"></script>
 <script>
 window.addEventListener("DOMContentLoaded", function() {
   // Create the client instance using the PusherFake server.