github/socket.io
1
1
Fork 0
mirror of https://github.com/socketio/socket.io.git synced 2026-04-30 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:LearnBoost/Socket.IO

Browse Source
This commit is contained in:
Guillermo Rauch
2011-06-18 19:08:47 -03:00
parent 3cdb331221 b545744617
commit 9503c04a58
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/socket.io.js vendored
View File

@@ -1529,7 +1529,7 @@
if (xhr.status == 200) {
complete(xhr.responseText);
} else {
self.onError(xhr.responseText);
!self.reconnecting && self.onError(xhr.responseText);
}
}
};

2
dist/socket.io.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
lib/parser.js
View File

@@ -62,7 +62,7 @@
*/
parser.encodePacket = function (packet) {
var type = packets.indexOf(packet.type)
var type = indexOf(packets, packet.type)
, id = packet.id || ''
, endpoint = packet.endpoint || ''
, ack = packet.ack
@@ -70,8 +70,8 @@
switch (packet.type) {
case 'error':
var reason = packet.reason ? reasons.indexOf(packet.reason) : ''
, adv = packet.advice ? advice.indexOf(packet.advice) : ''
var reason = packet.reason ? indexOf(reasons, packet.reason) : ''
, adv = packet.advice ? indexOf(advice, packet.advice) : ''
if (reason !== '' || adv !== '')
data = reason + (adv !== '' ? ('+' + adv) : '')

2
lib/socket.js
View File

@@ -141,7 +141,7 @@
if (xhr.status == 200) {
complete(xhr.responseText);
} else {
self.onError(xhr.responseText);
!self.reconnecting && self.onError(xhr.responseText);
}
}
};