patchfix

MegaBits · Oct 17, 2014 · fff5257 · fff5257
1 parent 997b613
commit fff5257
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,6 @@ An NSArray of these JSValue-valid objects:
 - NSNumber      
 - NSDictionary    
 - NSArray       
-- NSDate
 - NSData
 
 ## Generators

diff --git a/SocketIO/Source/SIOSocket.h b/SocketIO/Source/SIOSocket.h
@@ -16,7 +16,6 @@ typedef NSArray SIOParameterArray;
 //       NSNumber      
 //     NSDictionary    
 //       NSArray       
-//        NSDate
 //        NSData
 // --------------------
 

diff --git a/SocketIO/Source/SIOSocket.m b/SocketIO/Source/SIOSocket.m
@@ -157,8 +157,8 @@ - (void)emit:(NSString *)event args:(SIOParameterArray *)args {
             NSString *dataString = [[NSString alloc] initWithData: arg encoding: NSUTF8StringEncoding];
             [arguments addObject: [NSString stringWithFormat: @"blob('%@')", dataString]];
         }
-        else if ([arg isKindOfClass: [NSArray class]] || [arg isKindOfClass: [NSDictionary class]] || [arg isKindOfClass: [NSDate class]]) {
-            [arguments addObject: [[JSValue valueWithObject: arg inContext: self.javascriptContext] description]];
+        else if ([arg isKindOfClass: [NSArray class]] || [arg isKindOfClass: [NSDictionary class]]) {
+            [arguments addObject: [[NSString alloc] initWithData: [NSJSONSerialization dataWithJSONObject: arg options: 0 error: nil] encoding: NSUTF8StringEncoding]];
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ An NSArray of these JSValue-valid objects: @@
     - NSNumber
     - NSDictionary
     - NSArray
-    - NSDate
     - NSData
     ## Generators
@@ Expand Down @@