Arnout Kazemier
|
aef8ed5409
|
Merge branch 'develop' of https://github.com/LearnBoost/Socket.IO into develop
Conflicts:
Makefile
test/index.html
|
2011-06-09 19:44:12 +02:00 |
|
Guillermo Rauch
|
5686f42af4
|
Added symlink to lib/io by the name of the project.
|
2011-06-09 13:31:27 -03:00 |
|
Guillermo Rauch
|
debafe5a54
|
Fixed io.util.request.
Removed fixed 80 port for node (must review this).
|
2011-06-09 13:28:19 -03:00 |
|
Guillermo Rauch
|
582c233a39
|
Fixed typo.
|
2011-06-09 13:28:07 -03:00 |
|
Arnout Kazemier
|
651dbda054
|
Updated the io to include the builder
Updated Make file to do node bin/builder.js
|
2011-06-09 14:49:27 +02:00 |
|
Arnout Kazemier
|
6dd7120b71
|
Moved the comment block for node inside the ifstatement, so it get's removed after compilation
|
2011-06-09 10:13:50 +02:00 |
|
Guillermo Rauch
|
e05b9ce990
|
Added other necessary io public properties.
|
2011-06-08 20:49:46 -03:00 |
|
Guillermo Rauch
|
15fefa0664
|
Changed; Transport#send is now only concerned with strings.
|
2011-06-07 17:13:18 -03:00 |
|
Guillermo Rauch
|
688497239f
|
Changed; style fixes.
|
2011-06-07 17:13:08 -03:00 |
|
Guillermo Rauch
|
631ad0ddad
|
Added Transport#packet.
Changed; Transport#onHeartbeat now leverages Transport#Packet.
|
2011-06-07 17:12:41 -03:00 |
|
Guillermo Rauch
|
56c67784d4
|
Added Socket#packet.
Removed Socket#send.
|
2011-06-07 17:11:54 -03:00 |
|
Guillermo Rauch
|
caa61e1f60
|
SocketNamespace#packet now calls Socket#packet.
|
2011-06-07 17:11:39 -03:00 |
|
Arnout Kazemier
|
5be17ed500
|
Connect event should now fire again..
|
2011-06-07 21:15:22 +02:00 |
|
Arnout Kazemier
|
343779bb1b
|
Don't double encode.. Removed .packet and just updated heartbeat to do a .send instead
|
2011-06-07 20:53:06 +02:00 |
|
Arnout Kazemier
|
87e8f7888e
|
Fixed missing .packet method
|
2011-06-06 22:41:04 +02:00 |
|
Guillermo Rauch
|
c83764f99f
|
Fixed error and disconnect handling for subsockets.
Added onConnect call in onOpen.
|
2011-06-06 12:36:19 -03:00 |
|
Guillermo Rauch
|
4926211566
|
Fixed decodePacket reference.
|
2011-06-06 12:31:48 -03:00 |
|
Guillermo Rauch
|
c5ccaa9adc
|
Added missing packet parameter.
|
2011-06-06 12:25:10 -03:00 |
|
Vladimir Dronnikov
|
ca4e2f5dcf
|
WS#prepareUrl should override Transport#prepareUrl
|
2011-06-06 08:16:10 -04:00 |
|
Vladimir Dronnikov
|
2ddd53d46c
|
WS#connect -> WS#open
|
2011-06-06 08:02:17 -04:00 |
|
Vladimir Dronnikov
|
55b98e282e
|
Merge branch 'develop' of github.com:3rd-Eden/Socket.IO into develop
|
2011-06-06 07:44:42 -04:00 |
|
Vladimir Dronnikov
|
0c52c5c3b2
|
cleanup
|
2011-06-06 07:40:41 -04:00 |
|
Arnout Kazemier
|
2c4350afbd
|
Merge branch 'develop' of git://github.com/dvv/Socket.IO into develop
|
2011-06-06 13:40:16 +02:00 |
|
Vladimir Dronnikov
|
e365ae8ec7
|
typo. Socket#onConnect() is given use
|
2011-06-06 07:28:09 -04:00 |
|
Arnout Kazemier
|
07e3605f92
|
Websocket so send error to socket.onError not to websocket.onError which will cause a loop
|
2011-06-06 13:20:06 +02:00 |
|
Vladimir Dronnikov
|
21e730fe60
|
Merge branch 'develop' of github.com:3rd-Eden/Socket.IO into develop
|
2011-06-06 07:17:46 -04:00 |
|
Arnout Kazemier
|
979f692921
|
Renamed this.socket to this.websocket as it clashes with the Socket instance in the tranport.. which is also called this.socket
|
2011-06-06 13:10:54 +02:00 |
|
Vladimir Dronnikov
|
4e5f83587a
|
Merge branch 'develop' of github.com:3rd-Eden/Socket.IO into develop
|
2011-06-06 04:52:24 -04:00 |
|
Arnout Kazemier
|
f864d2ec72
|
Fixes wrong inhert & mixin arguments + added io.sockets
|
2011-06-06 10:46:00 +02:00 |
|
Vladimir Dronnikov
|
c260ad8756
|
Merge branch 'develop' of github.com:3rd-Eden/Socket.IO into develop
Conflicts:
lib/transports/websocket.js
socket.io.min.js
|
2011-06-06 03:47:42 -04:00 |
|
Vladimir Dronnikov
|
d1f1ce4575
|
this typos
|
2011-06-06 03:40:31 -04:00 |
|
Arnout Kazemier
|
02ba0d7db8
|
Updated to the correct position of the parsers
|
2011-06-05 21:38:33 +02:00 |
|
Arnout Kazemier
|
e04f5e36b2
|
Use native JSON if it's supported
Updated reference in transport to the new location of the parser
Updated the test suite to use the io.JSON
|
2011-06-05 21:32:38 +02:00 |
|
Arnout Kazemier
|
766f5d595e
|
Added qunit test suite for the parser
|
2011-06-05 20:58:53 +02:00 |
|
Arnout Kazemier
|
c8c2c6ede4
|
add all parse methods under the parser namespace
|
2011-06-05 19:34:55 +02:00 |
|
Arnout Kazemier
|
796506f91a
|
Fixed uniqueUri as parseUri doesn't return :// for protocols
it https should default to port 443 instead of port 80
the merge function now allows deep merges without chocking on recursion
|
2011-06-02 22:33:35 +02:00 |
|
Arnout Kazemier
|
4d87a8ccd6
|
Only check for complete, loaded indicates that the DOM is loaded, and not the page and all its resources
|
2011-06-02 20:57:07 +02:00 |
|
Arnout Kazemier
|
08e19abff6
|
Use native Array.isArray where possible
|
2011-06-02 20:52:23 +02:00 |
|
Arnout Kazemier
|
78b5c80a95
|
Changed the 'undefined' === module check as in the qunit test suite module is a function and this caused allot errors;
|
2011-06-02 20:12:23 +02:00 |
|
Arnout Kazemier
|
e04fb5e9f7
|
added alias for addListener as the EventEmitter also supports this
|
2011-06-02 20:11:49 +02:00 |
|
Vladimir Dronnikov
|
e71b2b5644
|
here we go again -- typos mostly
|
2011-06-02 08:20:07 -04:00 |
|
Vladimir Dronnikov
|
c6d938babe
|
another portion of typos
|
2011-06-02 06:57:57 -04:00 |
|
Vladimir Dronnikov
|
824282d382
|
typos
|
2011-06-02 06:34:41 -04:00 |
|
Guillermo Rauch
|
49816ac6c1
|
Added new io namespace.
|
2011-05-30 11:31:37 -03:00 |
|
Guillermo Rauch
|
6267a02056
|
Refactored Socket
|
2011-05-30 11:31:24 -03:00 |
|
Guillermo Rauch
|
e809856d84
|
Refactored Transport
|
2011-05-30 11:31:12 -03:00 |
|
Guillermo Rauch
|
3524463831
|
Refactored HTMLFile
|
2011-05-30 11:31:01 -03:00 |
|
Guillermo Rauch
|
d1a119d9c3
|
New EventEmitter
|
2011-05-30 11:30:51 -03:00 |
|
Guillermo Rauch
|
e6c49ea102
|
Now bundling (non-global non-obstrusive) JSON.
|
2011-05-30 11:30:31 -03:00 |
|
Guillermo Rauch
|
5650e91ecb
|
Added new parser.
|
2011-05-30 11:30:25 -03:00 |
|