146 Commits

Author SHA1 Message Date
Erik
652c81a80e add back default value 2015-07-09 10:38:24 -04:00
Erik
422b93f577 Merge branch 'master' into swift-2
* master:
  Invalidate timer on reconnect failure
  fix socketio/socket.io-client-swift#110 calling close while trying to reconnect
2015-07-03 14:07:03 -04:00
Erik
998089df91 Invalidate timer on reconnect failure 2015-07-03 13:58:06 -04:00
Erik
283644b75c fix socketio/socket.io-client-swift#110 calling close while trying to reconnect 2015-07-03 13:53:40 -04:00
Erik
38a7cc8648 whitespace 2015-07-03 09:04:40 -04:00
Erik
a22869efad Just use regular array for packets 2015-07-03 09:03:44 -04:00
Erik
6ecd1e2a79 merge master 2015-07-01 07:10:19 -04:00
Erik
a49f8f19cf add extraHeaders option fixes. nuclearace/Socket.IO-Client-Swift#64 2015-07-01 07:05:06 -04:00
Erik
b388df798b shorter expression in off 2015-06-29 21:25:00 -04:00
Erik
362f4e90b8 merge master 2015-06-24 07:05:38 -04:00
Erik
ca3f3e810d fix socketio/socket.io-client-swift#97 2015-06-24 06:51:47 -04:00
Erik
eb00be0aaa Merge branch 'master' into swift-2
* master:
  set connecting
2015-06-23 18:57:49 -04:00
Erik
d8e3408565 set connecting 2015-06-23 18:57:37 -04:00
Erik
9454a47ef4 fix binary 2015-06-23 15:11:30 -04:00
Erik
bd88ff763b change default type 2015-06-19 09:28:13 -04:00
Erik
df2f149f85 handle acks better 2015-06-19 08:12:27 -04:00
Erik
65be52418d remove old stuff 2015-06-19 08:02:51 -04:00
Erik
76637d160e use struct for socketpacket 2015-06-19 08:00:09 -04:00
Erik
f17575b35c use computed variable for sid 2015-06-16 05:14:32 -04:00
Erik
f2e5a1437b use computed variable for sid 2015-06-16 05:13:08 -04:00
Erik
a0c676bc54 unify objc/swift constructors 2015-06-12 09:42:44 -04:00
Erik
5854262280 Fix reference error 2015-06-12 09:39:39 -04:00
Erik
1c8fcee772 remove comment 2015-06-12 09:23:11 -04:00
Erik
11d8430537 use struct 2015-06-11 11:50:30 -04:00
Erik
a15b57e900 extract methods, clean up 2015-06-10 19:27:07 -04:00
Erik
fafeebe185 remove warnings 2015-06-08 21:03:49 -04:00
Erik
7bf35e182c tweaks 2015-06-08 20:23:22 -04:00
Erik
78727dc0ee untested with socket.io, this just compiles 2015-06-08 20:02:59 -04:00
Erik
1a54decd51 fix socketio/socket.io-client-swift#93 2015-06-06 22:30:56 -04:00
Erik
d982cdc1b2 only do interpolation when logging 2015-06-06 13:15:22 -04:00
Erik
33d5fd3f10 fix base64 data 2015-06-05 06:57:59 -04:00
Erik
3be5621263 remove comment 2015-05-31 11:09:25 -04:00
Erik
81ab71f519 extract methods 2015-05-31 11:07:48 -04:00
Erik
bfeec57c04 don't need type 2015-05-29 10:30:59 -04:00
Erik
0b09a1357c use didset instead of computed variable 2015-05-29 10:29:26 -04:00
Erik
e8dfe589ac redo pingtimeouts 2015-05-29 10:10:24 -04:00
Erik
fcebc870c3 fix socket.io/socket.io-client-swift#87 2015-05-27 07:28:06 -04:00
Erik
fa0d5022cf fix socketio/socket.io-client-swift#85 2015-05-24 08:10:43 -04:00
Erik
2fdd1313a8 move open logic to method 2015-05-22 07:26:52 -04:00
Erik
61b4628d3e only use self when needed 2015-05-19 22:13:08 -04:00
Erik
a6f68e7b70 tweaks 2015-05-17 08:28:10 -04:00
Erik
bb3d7fbded add leavenamepsace method, expose joinNamespace 2015-05-14 13:22:25 -04:00
Erik
3abb26565b tweak closing engine 2015-05-11 09:19:46 -04:00
Erik
5a5dc70203 fix nuclearace/Socket.IO-Client-Swift#46 2015-05-09 15:20:03 -04:00
Erik
88c139ed0c clean up 2015-05-07 10:32:30 -04:00
Erik
fdfd4dbc4d newlines 2015-05-01 11:37:59 -04:00
Erik
9e0726d61f fix socketio/socket.io-client-swift#72 2015-04-29 23:34:49 -04:00
Erik
90bbc9521f work on socketio/socket.io-client-swift#70 2015-04-29 00:39:53 -04:00
Erik
7a1a0d91f9 work on socketio/socket.io-client-swift#70 2015-04-29 00:29:36 -04:00
Erik
10ffe54b08 fix socketio/socket.io-client-swift#69 2015-04-28 09:50:12 -04:00