handle nil data in _sendData rather than each callHandler

jberkman · jberkman · commit 2f129dac1a84 · 2013-09-27T13:41:53.000-07:00
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/WebViewJavascriptBridge.m
@@ -56,7 +56,7 @@ - (void)send:(NSDictionary *)data responseCallback:(WVJBResponseCallback)respons
 }
 
 - (void)callHandler:(NSString *)handlerName {
-    [self callHandler:handlerName data:[NSNull null] responseCallback:nil];
+    [self callHandler:handlerName data:nil responseCallback:nil];
 }
 
 - (void)callHandler:(NSString *)handlerName data:(id)data {
@@ -92,6 +92,9 @@ - (void)dealloc {
 }
 
 - (void)_sendData:(NSDictionary *)data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString*)handlerName {
+    if (!data) {
+        data = (NSDictionary *)[NSNull null];
+    }
     NSMutableDictionary* message = [NSMutableDictionary dictionaryWithObject:data forKey:@"data"];
     
     if (responseCallback) {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ - (void)send:(NSDictionary *)data responseCallback:(WVJBResponseCallback)respons`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`- (void)callHandler:(NSString *)handlerName {`
`59`		`- [self callHandler:handlerName data:[NSNull null] responseCallback:nil];`
	`59`	`+ [self callHandler:handlerName data:nil responseCallback:nil];`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`- (void)callHandler:(NSString *)handlerName data:(id)data {`
`@@ -92,6 +92,9 @@ - (void)dealloc {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`- (void)_sendData:(NSDictionary )data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString)handlerName {`
	`95`	`+ if (!data) {`
	`96`	`+ data = (NSDictionary *)[NSNull null];`
	`97`	`+ }`
`95`	`98`	`NSMutableDictionary* message = [NSMutableDictionary dictionaryWithObject:data forKey:@"data"];`
`96`	`99`
`97`	`100`	`if (responseCallback) {`