Document the bridge constructor with a UIWebViewDelegate given, and change the signature so as to always put the handler last

marcuswestin · marcuswestin · commit 8ac33bfcb26d · 2012-09-18T19:34:12.000-07:00
diff --git a/README.md b/README.md
@@ -63,6 +63,7 @@ API Reference
 ### ObjC
 
 ##### `[WebViewJavascriptBridge javascriptBridgeForWebView:(UIWebView*)webview handler:(WVJBHandler)handler]`
+##### `[WebViewJavascriptBridge javascriptBridgeForWebView:(UIWebView*)webview webViewDelegate:(UIWebViewDelegate*)webViewDelegate handler:(WVJBHandler)handler]`
 
 Create a javascript bridge for the given UIWebView.
 
@@ -74,9 +75,14 @@ Example:
 			responseCallback(@"Right back atcha")
 		}
 	}]
+	
+	[WebViewJavascriptBridge javascriptBridgeForWebView:webView webViewDelegate:self handler:^(id data, WVJBCallback responseCallback) { /* ... */ }];
 
 The handler's `responseCallback` will be a block if javascript sent the message with a function responseCallback, or `nil` otherwise.
 
+Optionally, pass in `webViewDelegate:(UIWebViewDelegate*)webViewDelegate` if you need to respond to the [UIWebView's lifecycle events](http://developer.apple.com/library/ios/documentation/uikit/reference/UIWebViewDelegate_Protocol/Reference/Reference.html).
+
+
 ##### `[bridge send:(id)data]`
 ##### `[bridge send:(id)data responseCallback:(WVJBResponseCallback)responseCallback]`
 
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.h b/WebViewJavascriptBridge/WebViewJavascriptBridge.h
@@ -8,7 +8,7 @@ typedef void (^WVJBHandler)(id data, WVJBResponseCallback responseCallback);
 @interface WebViewJavascriptBridge : NSObject <UIWebViewDelegate>
 
 + (id)javascriptBridgeForWebView:(UIWebView*)webView handler:(WVJBHandler)handler;
-+ (id)javascriptBridgeForWebView:(UIWebView*)webView handler:(WVJBHandler)handler webViewDelegate:(id <UIWebViewDelegate>)webViewDelegate;
++ (id)javascriptBridgeForWebView:(UIWebView*)webView webViewDelegate:(id <UIWebViewDelegate>)webViewDelegate handler:(WVJBHandler)handler;
 
 - (void)send:(id)message;
 - (void)send:(id)message responseCallback:(WVJBResponseCallback)responseCallback;
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/WebViewJavascriptBridge.m
@@ -27,10 +27,10 @@ @implementation WebViewJavascriptBridge
 static NSString *QUEUE_HAS_MESSAGE = @"__WVJB_QUEUE_MESSAGE__";
 
 + (id)javascriptBridgeForWebView:(UIWebView *)webView handler:(WVJBHandler)handler {
-    return [self javascriptBridgeForWebView:webView handler:handler webViewDelegate:nil];
+    return [self javascriptBridgeForWebView:webView webViewDelegate:nil handler:handler];
 }
     
-+ (id)javascriptBridgeForWebView:(UIWebView *)webView handler:(WVJBHandler)messageHandler webViewDelegate:(id<UIWebViewDelegate>)webViewDelegate {
++ (id)javascriptBridgeForWebView:(UIWebView *)webView webViewDelegate:(id<UIWebViewDelegate>)webViewDelegate handler:(WVJBHandler)messageHandler {
     WebViewJavascriptBridge* bridge = [[WebViewJavascriptBridge alloc] init];
     bridge.messageHandler = messageHandler;
     bridge.startupMessageQueue = [NSMutableArray array];
