Permalink
Browse files

Missed a few references to socket.io version in my first pass.

  • Loading branch information...
dinjas committed Dec 23, 2011
1 parent 7028da1 commit 5e7b5d7726a63df770e2aa39218c5c133928b68a
Showing with 41 additions and 41 deletions.
  1. +22 −22 client.js
  2. +17 −17 client/vendor/assets/javascripts/socket_io.js
  3. +2 −2 public/application.js
View
@@ -1,4 +1,4 @@
-/*! Socket.IO.js build:0.8.6, development. Copyright(c) 2011 LearnBoost <dev@learnboost.com> MIT Licensed */
+/*! Socket.IO.js build:0.8.7, development. Copyright(c) 2011 LearnBoost <dev@learnboost.com> MIT Licensed */
/**
* socket.io
@@ -23,7 +23,7 @@
* @api public
*/
- io.version = '0.8.6';
+ io.version = '0.8.7';
/**
* Protocol implemented.
@@ -317,7 +317,7 @@
*
* @api public
*/
-
+
util.merge = function merge (target, additional, deep, lastseen) {
var seen = lastseen || []
, depth = typeof deep == 'undefined' ? 2 : deep
@@ -342,7 +342,7 @@
*
* @api public
*/
-
+
util.mixin = function (ctor, ctor2) {
util.merge(ctor.prototype, ctor2.prototype);
};
@@ -404,7 +404,7 @@
return Array.prototype.indexOf.call(arr, o, i);
}
- for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0;
+ for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0;
i < j && arr[i] !== o; i++) {}
return j <= i ? -1 : i;
@@ -1270,8 +1270,8 @@
Transport.prototype.onData = function (data) {
this.clearCloseTimeout();
-
- // If the connection in currently open (or in a reopening state) reset the close
+
+ // If the connection in currently open (or in a reopening state) reset the close
// timeout since we have just received data. This check is necessary so
// that we don't reset the timeout on an explicitly disconnected connection.
if (this.connected || this.connecting || this.reconnecting) {
@@ -1317,7 +1317,7 @@
*
* @api private
*/
-
+
Transport.prototype.setCloseTimeout = function () {
if (!this.closeTimeout) {
var self = this;
@@ -1401,7 +1401,7 @@
Transport.prototype.onHeartbeat = function (heartbeat) {
this.packet({ type: 'heartbeat' });
};
-
+
/**
* Called when the transport opens.
*
@@ -1810,7 +1810,7 @@
var port = global.location.port ||
('https:' == global.location.protocol ? 443 : 80);
- return this.options.host !== global.location.hostname
+ return this.options.host !== global.location.hostname
|| this.options.port != port;
};
@@ -2082,7 +2082,7 @@
*
* @api public
*/
-
+
SocketNamespace.prototype.emit = function (name) {
var args = Array.prototype.slice.call(arguments, 1)
, lastArg = args[args.length - 1]
@@ -2422,7 +2422,7 @@
*
* @api public
*/
-
+
exports.XHR = XHR;
/**
@@ -2539,7 +2539,7 @@
/**
* Disconnects the established `XHR` connection.
*
- * @returns {Transport}
+ * @returns {Transport}
* @api public
*/
@@ -2607,7 +2607,7 @@
/**
* Check if the XHR transport supports corss domain requests.
- *
+ *
* @returns {Boolean}
* @api public
*/
@@ -2638,7 +2638,7 @@
/**
* The HTMLFile transport creates a `forever iframe` based transport
- * for Internet Explorer. Regular forever iframe implementations will
+ * for Internet Explorer. Regular forever iframe implementations will
* continuously trigger the browsers buzy indicators. If the forever iframe
* is created inside a `htmlfile` these indicators will not be trigged.
*
@@ -2840,7 +2840,7 @@
XHRPolling.prototype.name = 'xhr-polling';
- /**
+ /**
* Establish a connection, for iPhone and Android this will be done once the page
* is loaded.
*
@@ -3096,7 +3096,7 @@
this.socket.setBuffer(true);
};
-
+
/**
* Creates a new JSONP poll that can be used to listen
* for messages from the Socket.IO server.
@@ -3206,10 +3206,10 @@
var Juggernaut = function(options){
this.options = options || {};
-
+
this.options.host = this.options.host || window.location.hostname;
this.options.port = this.options.port || 8080;
-
+
this.handlers = {};
this.meta = this.options.meta;
@@ -3273,9 +3273,9 @@ Juggernaut.fn.subscribe = function(channel, callback){
Juggernaut.fn.unsubscribe = function(channel) {
if ( !channel ) throw "Must provide a channel";
-
+
this.unbind(channel + ":data");
-
+
var message = new Juggernaut.Message;
message.type = "unsubscribe";
message.channel = channel;
@@ -3288,7 +3288,7 @@ Juggernaut.fn.unsubscribe = function(channel) {
Juggernaut.fn.trigger = function(){
var args = [];
for (var f=0; f < arguments.length; f++) args.push(arguments[f]);
-
+
var name = args.shift();
var callbacks = this.handlers[name];
@@ -1,4 +1,4 @@
-/*! Socket.IO.js build:0.8.6, development. Copyright(c) 2011 LearnBoost <dev@learnboost.com> MIT Licensed */
+/*! Socket.IO.js build:0.8.7, development. Copyright(c) 2011 LearnBoost <dev@learnboost.com> MIT Licensed */
/**
* socket.io
@@ -22,7 +22,7 @@
* @api public
*/
- io.version = '0.8.6';
+ io.version = '0.8.7';
/**
* Protocol implemented.
@@ -316,7 +316,7 @@
*
* @api public
*/
-
+
util.merge = function merge (target, additional, deep, lastseen) {
var seen = lastseen || []
, depth = typeof deep == 'undefined' ? 2 : deep
@@ -341,7 +341,7 @@
*
* @api public
*/
-
+
util.mixin = function (ctor, ctor2) {
util.merge(ctor.prototype, ctor2.prototype);
};
@@ -403,7 +403,7 @@
return Array.prototype.indexOf.call(arr, o, i);
}
- for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0;
+ for (var j = arr.length, i = i < 0 ? i + j < 0 ? 0 : i + j : i || 0;
i < j && arr[i] !== o; i++) {}
return j <= i ? -1 : i;
@@ -1269,8 +1269,8 @@
Transport.prototype.onData = function (data) {
this.clearCloseTimeout();
-
- // If the connection in currently open (or in a reopening state) reset the close
+
+ // If the connection in currently open (or in a reopening state) reset the close
// timeout since we have just received data. This check is necessary so
// that we don't reset the timeout on an explicitly disconnected connection.
if (this.connected || this.connecting || this.reconnecting) {
@@ -1316,7 +1316,7 @@
*
* @api private
*/
-
+
Transport.prototype.setCloseTimeout = function () {
if (!this.closeTimeout) {
var self = this;
@@ -1400,7 +1400,7 @@
Transport.prototype.onHeartbeat = function (heartbeat) {
this.packet({ type: 'heartbeat' });
};
-
+
/**
* Called when the transport opens.
*
@@ -1809,7 +1809,7 @@
var port = global.location.port ||
('https:' == global.location.protocol ? 443 : 80);
- return this.options.host !== global.location.hostname
+ return this.options.host !== global.location.hostname
|| this.options.port != port;
};
@@ -2081,7 +2081,7 @@
*
* @api public
*/
-
+
SocketNamespace.prototype.emit = function (name) {
var args = Array.prototype.slice.call(arguments, 1)
, lastArg = args[args.length - 1]
@@ -2421,7 +2421,7 @@
*
* @api public
*/
-
+
exports.XHR = XHR;
/**
@@ -2538,7 +2538,7 @@
/**
* Disconnects the established `XHR` connection.
*
- * @returns {Transport}
+ * @returns {Transport}
* @api public
*/
@@ -2606,7 +2606,7 @@
/**
* Check if the XHR transport supports corss domain requests.
- *
+ *
* @returns {Boolean}
* @api public
*/
@@ -2637,7 +2637,7 @@
/**
* The HTMLFile transport creates a `forever iframe` based transport
- * for Internet Explorer. Regular forever iframe implementations will
+ * for Internet Explorer. Regular forever iframe implementations will
* continuously trigger the browsers buzy indicators. If the forever iframe
* is created inside a `htmlfile` these indicators will not be trigged.
*
@@ -2839,7 +2839,7 @@
XHRPolling.prototype.name = 'xhr-polling';
- /**
+ /**
* Establish a connection, for iPhone and Android this will be done once the page
* is loaded.
*
@@ -3095,7 +3095,7 @@
this.socket.setBuffer(true);
};
-
+
/**
* Creates a new JSONP poll that can be used to listen
* for messages from the Socket.IO server.
Oops, something went wrong.

0 comments on commit 5e7b5d7

Please sign in to comment.