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
168 Commits 24 Branches 210 Tags
f1332af1eefff05030bf7efb950b4297253dd591
Commit Graph

134 Commits

Author SHA1 Message Date
Guillermo Rauch
f1332af1ee Renaming fire to emit and making a copy of events first (thanks @fjakobs) 2010-12-23 15:00:27 -08:00
Guillermo Rauch
7a5197c1e7 Make sure to only destroy if the _iframe was created 2010-11-01 12:58:25 -03:00
Guillermo Rauch
9fb0b3ec8a Fixed io.util.merge 2010-10-30 21:28:48 -03:00
Guillermo Rauch
1f06916c4e Added io.utils.merge 
Removed flashsocket onClose logic since its handled by connectTimeout
Added socket checks when disconnecting / sending messages
 2010-10-28 19:15:08 -03:00
Guillermo Rauch
e31a3beeed Fixed semicolons (thanks SINPacifist) 2010-10-20 19:21:31 -03:00
Guillermo Rauch
d8da8efe91 Added io.util.merge for options merging. Probably should be recursive at some point. Thanks SINPacifist 2010-10-20 19:18:19 -03:00
Guillermo Rauch
c226b89c29 Removed unnecessary onClose handling, since this is taken care by Socket (thanks SINPacifist) 2010-10-20 19:12:15 -03:00
Guillermo Rauch
336331a32c Make sure not to try other transports if the socket.io cookie was there 2010-09-25 11:06:22 +02:00
Guillermo Rauch
33c40b96d1 Temporarily reverting to /socket.io/ to serve the SWF 2010-09-24 06:03:58 +02:00
Guillermo Rauch
669ff4c038 Updating web-socket-js 2010-09-20 17:58:11 -07:00
Guillermo Rauch
ef13f123ba Oops 2010-09-20 16:28:21 -07:00
Guillermo Rauch
9501cb1197 Make sure not to abort the for loop when skipping the transport 2010-09-20 16:26:00 -07:00
Guillermo Rauch
f6d29b62a5 Fix for this inside of the timeout 
Build
 2010-09-20 15:59:01 -07:00
Guillermo Rauch
c2917c7989 Connect timeout (fixes #34) 
Try different transports upon connect timeout (fixes #35)
 2010-09-20 15:53:29 -07:00
Guillermo Rauch
c73d292d9e Restored rememberTransport to default 2010-09-20 15:40:52 -07:00
Guillermo Rauch
aa8afe4d5d Removed io.setPath check 2010-09-20 15:39:35 -07:00
Guillermo Rauch
8dc8e90540 CDN instructions 2010-09-20 12:42:46 -07:00
Guillermo Rauch
4a52e9ab71 Make sure IE7 doesn't err on the multipart feature detection. Thanks Davin Lunz 2010-09-10 12:09:39 -07:00
Guillermo Rauch
1851f58a81 CORS feature detection. Fixes IE7 attempting cross domain requests through their incomplete XMLHttpRequest implementation. 2010-09-09 17:31:31 -07:00
Guillermo Rauch
660f9adb2c Now altering WEB_SOCKET_SWF_LOCATION (this way we don't need the web-socket-js WebSocket object to be there) 
Flashsocket .connect() and .send() call addTask.
Removed _loaded, since addTask does load checking internally
Build
 2010-09-09 17:19:55 -07:00
Guillermo Rauch
30b7200a53 Make sure flashsocket can only be loaded on browsers that don't have a native websocket 2010-09-09 16:36:51 -07:00
Guillermo Rauch
86c35873ca Leveraging __addTask to delay sent messages until WebSocket through SWF is fully loaded. 
Removing __isFlashLite check
 2010-09-09 16:18:09 -07:00
Guillermo Rauch
13c638178a Leverage node.js serving of the client side files 
Make sure we can load io.js from node (window check)
 2010-09-09 14:06:41 -07:00
Guillermo Rauch
9a4bb0076d Fix for XDomain send() on IE8 (thanks Eric Zhang) 2010-09-07 01:38:23 -07:00
Arnout Kazemier
aec758df99 new build 2010-09-03 13:30:47 +02:00
Arnout Kazemier
520aeaddf4 Made sure no errors where thrown in IE if there isn't a flash fallback available. 2010-09-03 13:22:55 +02:00
Guillermo Rauch
7f5b56ab78 Make sure disconnect event is only fired if the socket was completely connected, and it's not a reconnection attempt that was interrupted. 2010-09-02 12:23:56 -07:00
Guillermo Rauch
7231783551 Force disconnection if .connect() is called and a connection attempt is ongoing 2010-09-02 12:14:00 -07:00
Guillermo Rauch
a646824285 Upon socket disconnection, also mark connecting as false 
.connecting flag in transport instance
Make sure .connecting is cleared in transport
 2010-09-02 12:01:08 -07:00
Guillermo Rauch
743ab80f80 Correct sessionid checking 2010-09-01 13:22:56 -07:00
Guillermo Rauch
6a7023da9d Clear sessionid upon disconnection 2010-09-01 13:18:37 -07:00
Guillermo Rauch
70dde951be Remove _xhr and _sendXhr objects 2010-09-01 11:44:43 -07:00
Guillermo Rauch
a848324d2a Added note about htmlfile cross-domain 2010-09-01 02:12:40 -07:00
Guillermo Rauch
750f746f60 Moved timeout default into Transport 2010-09-01 02:05:55 -07:00
Guillermo Rauch
5548e916ad Added timeout 
Remove callbacks on _onDisconnect and call abort()
Added placeholder for direct disconnect in XHR
 2010-09-01 01:59:42 -07:00
Guillermo Rauch
a9d5285509 Timeout logic (fixes #31) 
Build
 2010-08-31 19:52:37 -07:00
Guillermo Rauch
29ce06f8d9 Don't check for data length to trigger _onData, since most transports are not doing it 2010-08-31 19:49:56 -07:00
Guillermo Rauch
cc05094d29 Set timeout defaults based on heartbeat interval and polling duration (since we dont do heartbeats for polling) 
Check for msgs.length _onData
 2010-08-31 19:49:12 -07:00
Guillermo Rauch
4c4bec9f44 Removed unused client option (heartbeatInterval) 2010-08-31 19:46:07 -07:00
Guillermo Rauch
6731b2d779 Added onDisconnect call if long poll is interrupted 2010-08-31 19:39:50 -07:00
Guillermo Rauch
56ee90d0bd Polling calls _get directly as opposed to connect() 
Build
 2010-08-31 19:30:54 -07:00
Guillermo Rauch
b2f92acbbe Disconnection handling upon failure to send a message through xhr-* transports. 
Clean up internal xhr buffer upon disconnection
Clean up general buffer in Socket upon disconnection
Mark socket as disconnected
 2010-08-31 19:18:04 -07:00
Guillermo Rauch
922a96d28c Opera 10 support 
Some README fixes
 - Added API example at the top
 - Added opera
 2010-08-31 13:05:41 -07:00
Guillermo Rauch
41ad4057f5 Fix for .fire on IE being called without arguments (fixes #28) + build 2010-08-30 18:42:09 -07:00
Guillermo Rauch
4697574a68 JSONP IE6-7 fixes 2010-08-30 15:22:11 -07:00
Guillermo Rauch
1561b52fee JSONP Polling send fix for IE (only tested in IE8) 2010-08-29 18:27:14 -07:00
Guillermo Rauch
bf0b541129 JSONP polling completed 2010-08-29 16:39:36 -07:00
Guillermo Rauch
c0c5a7e653 Missing inherit call 2010-08-26 16:50:56 -07:00
Guillermo Rauch
bfdb66eac2 Added jsonp-polling to the build script 
Version set to 0.6
 2010-08-26 16:11:43 -07:00
Guillermo Rauch
596c39e64b JSONP Polling transport 
Some small changes for xdomain XHR feature detection
 2010-08-26 15:44:39 -07:00