70 Commits

Author SHA1 Message Date
Erik
09a26c0b1c remove all data on engine close 2015-08-17 00:04:13 -04:00
Erik
f752507a11 style 2015-08-14 22:08:33 -04:00
Erik
2cafec6f12 move enum, better description 2015-08-14 16:20:43 -04:00
Erik
7ebcd7439f refactor, fix reconnect bug, fix internalmessages 2015-08-13 09:56:22 -04:00
Erik
5e92fc323d dammit 2015-08-11 10:05:35 -04:00
Erik
c2b927fd02 oops 2015-08-11 10:04:43 -04:00
Erik
4014286da2 style 2015-08-11 10:03:35 -04:00
Erik
884b73c777 clean up 2015-08-11 09:54:59 -04:00
Erik
848f7e5da7 clean up enums 2015-08-11 08:31:23 -04:00
Erik
42aced5e9c don't remove engine 2015-08-10 11:00:01 -04:00
Lukas Schmidt
d0f091e983 remove unused variables 2015-08-10 07:44:01 +02:00
Lukas Schmidt
6fa7636261 working test
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 07:14:52 +02:00
Lukas Schmidt
5eeac96b2b fix issues
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 07:04:11 +02:00
Lukas Schmidt
184b97ef8c fix merge issues
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 06:21:29 +02:00
Lukas Schmidt
d0ec1de566 merge
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 06:18:37 +02:00
Lukas Schmidt
643ddb5bf9 Merge branch 'swift-2' of https://github.com/socketio/socket.io-client-swift into API-improvements
# Conflicts:
#	SocketIOClientSwift/SocketEngine.swift
#	SocketIOClientSwift/SocketIOClient.swift
#	SocketIOClientSwift/SocketTypes.swift

Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 06:18:28 +02:00
Erik
514193e6ec Merge master 2015-08-05 06:12:35 -04:00
Lukas Schmidt
969e6d6ea8 minor imporvements
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-05 12:12:21 +02:00
Erik
ffbe1e4ec4 add option for handle queue 2015-08-05 06:09:24 -04:00
Erik
80ea42c91f document objc method 2015-08-05 06:03:06 -04:00
Erik
06e2311acc fix socketio/socket.io-client-swift#133 can't expose variadics to objective-c 2015-08-03 12:41:14 -04:00
Erik
2579c04f67 better swift style 2015-08-03 10:07:59 -04:00
Lukas Schmidt
7800591367 cleanup status api 2015-08-02 18:47:37 +02:00
Erik
d073fa8a83 Merge branch 'master' into swift-2
* master:
  maybe fix socketio/socket.io-client-swift#100 and socketio/socket.io-client-swift#22
  Added SocketIOClient.removeAllHandlers
  Updated BuildableName in schemes
  bump version
2015-07-12 21:11:18 -04:00
NachoSoto
5f75e6080b Added SocketIOClient.removeAllHandlers 2015-07-13 00:09:05 +00:00
Erik
8daa7da426 clean up namespace logic 2015-07-09 12:29:26 -04:00
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
a22869efad Just use regular array for packets 2015-07-03 09:03:44 -04:00
Erik
b388df798b shorter expression in off 2015-06-29 21:25:00 -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
df2f149f85 handle acks better 2015-06-19 08:12:27 -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
a15b57e900 extract methods, clean up 2015-06-10 19:27:07 -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
fcebc870c3 fix socket.io/socket.io-client-swift#87 2015-05-27 07:28:06 -04:00
Erik
61b4628d3e only use self when needed 2015-05-19 22:13:08 -04:00
Erik
bb3d7fbded add leavenamepsace method, expose joinNamespace 2015-05-14 13:22:25 -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
90bbc9521f work on socketio/socket.io-client-swift#70 2015-04-29 00:39:53 -04:00