From ff8c4f09a04835193949161b4959773ffb103693 Mon Sep 17 00:00:00 2001 From: Guillermo Rauch Date: Thu, 18 Mar 2010 20:57:35 -0700 Subject: [PATCH] Indention fixes --- lib/socket.io.js | 3 +- lib/socket.io/client.js | 30 ++++++++-------- lib/socket.io/transports/flashsocket.js | 10 +++--- lib/socket.io/transports/htmlfile.js | 2 +- lib/socket.io/transports/server-events.js | 2 +- lib/socket.io/transports/websocket.js | 26 +++++++------- lib/socket.io/transports/xhr-multipart.js | 2 +- lib/socket.io/transports/xhr-polling.js | 4 +-- lib/socket.io/util/object.js | 42 +++++++++++------------ 9 files changed, 61 insertions(+), 60 deletions(-) diff --git a/lib/socket.io.js b/lib/socket.io.js index 5ee8a0856e..b180c83573 100644 --- a/lib/socket.io.js +++ b/lib/socket.io.js @@ -1,7 +1,8 @@ require.paths.unshift(__dirname + '/vendor/js-oo/lib'); require('oo'); + var sys = require('sys'), - Listener = require('./socket.io/listener').Listener; + Listener = require('./socket.io/listener').Listener; this.listen = function(server, options){ return new Listener(server, options); diff --git a/lib/socket.io/client.js b/lib/socket.io/client.js index 3901ac0ffb..149feb4515 100644 --- a/lib/socket.io/client.js +++ b/lib/socket.io/client.js @@ -1,33 +1,33 @@ var sys = require('sys'); this.Client = Class({ - + init: function(listener, req, res){ this.listener = listener; this.connections = 0; this.connected = false; this._onConnect(req, res); }, - + send: function(message){ if (!this.connected || !(this.connection.readyState == 'open' || this.connection.readyState == 'writeOnly')) return this._queue(message); this._write(JSON.stringify({messages: [message]})); return this; }, - + broadcast: function(message){ if (!('sessionId' in this)) return this; this.listener.broadcast(message, this.sessionId); return this; }, - + _onMessage: function(data){ var messages = JSON.parse(data); for (var i = 0, l = messages.length; i < l; i++){ this.listener._onClientMessage(messages[i], this); } }, - + _onConnect: function(req, res){ var self = this; this.request = req; @@ -35,13 +35,13 @@ this.Client = Class({ this.connection = this.request.connection; if (this._disconnectTimeout) clearTimeout(this._disconnectTimeout); }, - + _payload: function(){ var payload = []; - + this.connections++; this.connected = true; - + if (!this.handshaked){ this._generateSessionId(); payload.push(JSON.stringify({ @@ -49,14 +49,14 @@ this.Client = Class({ })); this.handshaked = true; } - + payload = payload.concat(this._writeQueue || []); this._writeQueue = []; - + if (payload.length) this._write(JSON.stringify({messages: payload})); if (this.connections == 1) this.listener._onClientConnect(this); }, - + _onClose: function(){ var self = this; this.connected = false; @@ -64,7 +64,7 @@ this.Client = Class({ self._onDisconnect(); }, this.listener.options.timeout); }, - + _onDisconnect: function(){ if (!this.finalized){ this._writeQueue = []; @@ -73,17 +73,17 @@ this.Client = Class({ if (this.handshaked) this.listener._onClientDisconnect(this); } }, - + _queue: function(message){ if (!('_writeQueue' in this)) this._writeQueue = []; this._writeQueue.push(message); return this; }, - + _generateSessionId: function(){ if (this.sessionId) return this.listener.options.log('This client already has a session id'); this.sessionId = Math.random().toString().substr(2); return this; } - + }); \ No newline at end of file diff --git a/lib/socket.io/transports/flashsocket.js b/lib/socket.io/transports/flashsocket.js index 7f8f347c38..21cf0fefc4 100644 --- a/lib/socket.io/transports/flashsocket.js +++ b/lib/socket.io/transports/flashsocket.js @@ -1,6 +1,6 @@ var websocket = require('./websocket').websocket, - tcp = require('tcp'), - listeners = []; + tcp = require('tcp'), + listeners = []; this.flashsocket = websocket.extend({}); @@ -12,14 +12,14 @@ tcp.createServer(function(socket){ socket.write('\n'); socket.write('\n'); socket.write('\n'); - + listeners.forEach(function(l){ [].concat(l.options.origins).forEach(function(origin){ var parts = origin.split(':'); socket.write('\n'); }); }); - + socket.write('\n'); - socket.close(); + socket.close(); }).listen(843); \ No newline at end of file diff --git a/lib/socket.io/transports/htmlfile.js b/lib/socket.io/transports/htmlfile.js index bd54f073bb..7d3ceb22dc 100644 --- a/lib/socket.io/transports/htmlfile.js +++ b/lib/socket.io/transports/htmlfile.js @@ -1,5 +1,5 @@ var Client = require('../client').Client, - qs = require('querystring'); + qs = require('querystring'); this['htmlfile'] = Client.extend({ diff --git a/lib/socket.io/transports/server-events.js b/lib/socket.io/transports/server-events.js index da22b7164a..63ff1d8dea 100644 --- a/lib/socket.io/transports/server-events.js +++ b/lib/socket.io/transports/server-events.js @@ -1,5 +1,5 @@ var Client = require('../client').Client, - qs = require('querystring'); + qs = require('querystring'); this['server-events'] = Client.extend({ diff --git a/lib/socket.io/transports/websocket.js b/lib/socket.io/transports/websocket.js index 7f398b033a..df5a8236f1 100644 --- a/lib/socket.io/transports/websocket.js +++ b/lib/socket.io/transports/websocket.js @@ -1,6 +1,6 @@ var Client = require('../client').Client, - url = require('url'), - sys = require('sys'); + url = require('url'), + sys = require('sys'); this.websocket = Client.extend({ @@ -25,23 +25,23 @@ this.websocket = Client.extend({ self.connection.setTimeout(0); self.connection.setNoDelay(true); self.connection.addListener('end', function(){ self._onClose(); }); - self.connection.addListener('data', function(data) { - if (data[0] !== '\u0000' && data[data.length - 1] !== '\ufffd'){ - self.connection.close(); - } else { + self.connection.addListener('data', function(data){ + if (data[0] !== '\u0000' && data[data.length - 1] !== '\ufffd'){ + self.connection.close(); + } else { self._onMessage(data.substr(1, data.length - 2)); } - }); + }); }); this.response.use_chunked_encoding_by_default = false; - this.response.writeHeader(101, 'Web Socket Protocol Handshake', { + this.response.writeHeader(101, 'Web Socket Protocol Handshake', { 'Upgrade': 'WebSocket', 'Connection': 'Upgrade', 'WebSocket-Origin': this.request.headers.origin, 'WebSocket-Location': 'ws://' + this.request.headers.host + this.request.url - }); - this.response.flush(); + }); + this.response.flush(); this._payload(); }, @@ -49,9 +49,9 @@ this.websocket = Client.extend({ _verifyOrigin: function(origin){ var parts = url.parse(origin); return this.listener.options.origins.indexOf('*:*') !== -1 - || this.listener.options.origins.indexOf(parts.host + ':' + parts.port) !== -1 - || this.listener.options.origins.indexOf(parts.host + ':*') !== -1 - || this.listener.options.origins.indexOf('*:' + parts.port) !== -1; + || this.listener.options.origins.indexOf(parts.host + ':' + parts.port) !== -1 + || this.listener.options.origins.indexOf(parts.host + ':*') !== -1 + || this.listener.options.origins.indexOf('*:' + parts.port) !== -1; }, _write: function(message){ diff --git a/lib/socket.io/transports/xhr-multipart.js b/lib/socket.io/transports/xhr-multipart.js index 9e7b7081df..f97406b3dd 100644 --- a/lib/socket.io/transports/xhr-multipart.js +++ b/lib/socket.io/transports/xhr-multipart.js @@ -1,5 +1,5 @@ var Client = require('../client').Client, - qs = require('querystring'); + qs = require('querystring'); this['xhr-multipart'] = Client.extend({ diff --git a/lib/socket.io/transports/xhr-polling.js b/lib/socket.io/transports/xhr-polling.js index 114336d981..52db613475 100644 --- a/lib/socket.io/transports/xhr-polling.js +++ b/lib/socket.io/transports/xhr-polling.js @@ -1,6 +1,6 @@ var Client = require('../client').Client, - qs = require('querystring'), - sys = require('sys'); + qs = require('querystring'), + sys = require('sys'); this['xhr-polling'] = Client.extend({ diff --git a/lib/socket.io/util/object.js b/lib/socket.io/util/object.js index 25503cf11a..e1486aedf4 100644 --- a/lib/socket.io/util/object.js +++ b/lib/socket.io/util/object.js @@ -2,34 +2,34 @@ // Copyright (c) 2006-2009 Valerio Proietti, var clone = this.clone = function(item){ - var clone; - if (item instanceof Array){ - clone = []; - for (var i = 0; i < item.length; i++) clone[i] = clone(item[i]); - return clone; - } else if (typeof item == 'object') { - clone = {}; - for (var key in object) clone[key] = clone(object[key]); - return clone; - } else { - return item; - } + var clone; + if (item instanceof Array){ + clone = []; + for (var i = 0; i < item.length; i++) clone[i] = clone(item[i]); + return clone; + } else if (typeof item == 'object') { + clone = {}; + for (var key in object) clone[key] = clone(object[key]); + return clone; + } else { + return item; + } }, mergeOne = function(source, key, current){ - if (current instanceof Array){ - source[key] = clone(current); - } else if (typeof current == 'object'){ - if (typeof source[key] == 'object') object.merge(source[key], current); + if (current instanceof Array){ + source[key] = clone(current); + } else if (typeof current == 'object'){ + if (typeof source[key] == 'object') object.merge(source[key], current); else source[key] = clone(current); - } else { - source[key] = current; - } - return source; + } else { + source[key] = current; + } + return source; }; this.merge = function(source, k, v){ - if (typeof k == 'string') return mergeOne(source, k, v); + if (typeof k == 'string') return mergeOne(source, k, v); for (var i = 1, l = arguments.length; i < l; i++){ var object = arguments[i]; for (var key in object) mergeOne(source, key, object[key]);