Commit Graph

288 Commits

Author SHA1 Message Date
Guillermo Rauch
2ccda648b4 Removed old tests location. 2011-06-07 17:00:48 -03:00
Guillermo Rauch
4df16105b1 Merge pull request #174 from 3rd-Eden/develop
Heartbeats and connect
2011-06-07 12:19:52 -07: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
d4788e7e2a Replaced testing files. 2011-06-06 13:22:15 -03: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
Guillermo Rauch
c9e674ab51 Merge pull request #173 from dvv/develop
Second chunk of fixes, cumulative with #170
2011-06-06 07:39:31 -07: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
3be0ff1043 rebuilt minified 2011-06-06 07:29:22 -04: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
0dae527615 Small refactor of the test suite to use equal instead of ok 2011-06-05 21:14:35 +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
478894bc35 new builds 2011-06-02 22:41:47 +02:00
Arnout Kazemier
6451fd6b2c Added util qunit test 2011-06-02 22:41:20 +02:00
Arnout Kazemier
e2a5ff8fbe fancy pancy redcarpet highlight 2011-06-02 22:39:20 +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
2de0561073 Added qunit test suite in /tests/qunit/qunit
Added io.qunit.js
Added event.qunit.js which follows the tests of the Node.js event emitter
2011-06-02 20:18:31 +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
Guillermo Rauch
4570b1e3e1 Merge pull request #166 from dvv/develop
Fixed typos
2011-06-02 05:49:05 -07: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
6fe5043ea4 Updated README 2011-05-30 12:39:44 -03:00
Guillermo Rauch
1c9db6c902 Updated builder 2011-05-30 11:31:51 -03: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