Merge pull request marcuswestin#2 from psineur/noARC-and-multipleWebViews-support

marcuswestin · marcuswestin · commit 8b1d103308b0 · 2011-11-04T16:49:43.000-07:00
Make jsBridge noARC &amp; multiple webViews-compatible, improve interface.
diff --git a/WebViewJavascriptBridge.xcodeproj/project.pbxproj b/WebViewJavascriptBridge.xcodeproj/project.pbxproj
@@ -11,7 +11,7 @@
 		2C1E9EA314099B4600C5C30E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C1E9EA214099B4600C5C30E /* Foundation.framework */; };
 		2C1E9EA914099B4600C5C30E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2C1E9EA714099B4600C5C30E /* InfoPlist.strings */; };
 		2C1E9EAB14099B4600C5C30E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C1E9EAA14099B4600C5C30E /* main.m */; };
-		2C1E9EB814099BC900C5C30E /* WebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C1E9EB714099BC900C5C30E /* WebViewJavascriptBridge.m */; };
+		2C1E9EB814099BC900C5C30E /* WebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C1E9EB714099BC900C5C30E /* WebViewJavascriptBridge.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		2C6D2131143017AF0069FA34 /* ExampleAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C6D2130143017AF0069FA34 /* ExampleAppDelegate.m */; };
 /* End PBXBuildFile section */
 
diff --git a/WebViewJavascriptBridge/Classes/WebViewJavascriptBridge.h b/WebViewJavascriptBridge/Classes/WebViewJavascriptBridge.h
@@ -2,23 +2,28 @@
 
 @protocol WebViewJavascriptBridgeDelegate <NSObject>
 
-- (void) handleMessage:(NSString*) message;
+- (void) handleMessage:(NSString*) message fromWebView: (UIWebView *)theWebView;
 
 @end
 
 @interface WebViewJavascriptBridge : NSObject <UIWebViewDelegate> {
-    id <WebViewJavascriptBridgeDelegate> delegate;
+    id <WebViewJavascriptBridgeDelegate> _delegate;
+    NSMutableArray *_startupMessageQueue;
 }
 
-@property (nonatomic, strong) id <WebViewJavascriptBridgeDelegate> delegate;
-@property (nonatomic, retain) UIWebView* webView;
-@property (nonatomic, strong) NSMutableArray* startupMessageQueue;
+/** Delegate to receive messages from javascript. */
+@property (readwrite, assign) id <WebViewJavascriptBridgeDelegate> delegate;
 
-+ (id) createWithDelegate:(id <WebViewJavascriptBridgeDelegate>) delegate;
+/** Creates & returns new autoreleased javascript Bridge with no delegate set. */
++ (id) javascriptBridge;
 
-- (void) sendMessage:(NSString*) message;
-
-- (void) _flushMessageQueue;
-- (void) _doSendMessage:(NSString*)message;
+/** Sends message to given webView. You need to integrate javascript bridge into 
+ * this view before by calling WebViewJavascriptBridge#webViewDidFinishLoad: with that view. 
+ *
+ * You can call this method before calling webViewDidFinishLoad: , than all messages
+ * will be accumulated in _startupMessageQueue & sended to webView, provided by first
+ * webViewDidFinishLoad: call.
+ */
+- (void) sendMessage:(NSString*) message toWebView:(UIWebView *) theWebView;
 
 @end
diff --git a/WebViewJavascriptBridge/Classes/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/Classes/WebViewJavascriptBridge.m
@@ -1,36 +1,59 @@
 #import "WebViewJavascriptBridge.h"
 
+@interface WebViewJavascriptBridge ()
+
+@property (readwrite,retain) NSMutableArray* startupMessageQueue;
+
+- (void) _flushMessageQueueFromWebView: (UIWebView *) theWebView;
+- (void) _doSendMessage:(NSString*)message toWebView:(UIWebView *) theWebView;
+
+@end
+
 @implementation WebViewJavascriptBridge
 
-@synthesize delegate;
-@synthesize webView;
-@synthesize startupMessageQueue;
+@synthesize delegate = _delegate;
+@synthesize startupMessageQueue = _startupMessageQueue;
 
 static NSString* MESSAGE_SEPERATOR = @"__wvjb_sep__";
 static NSString* CUSTOM_PROTOCOL_SCHEME = @"webviewjavascriptbridge";
 static NSString* QUEUE_HAS_MESSAGE = @"queuehasmessage";
 
-+ (id) createWithDelegate:(id <WebViewJavascriptBridgeDelegate>) delegate {
-    WebViewJavascriptBridge* bridge = [[WebViewJavascriptBridge alloc] init];
-    bridge.delegate = delegate;
-    bridge.startupMessageQueue = [[NSMutableArray alloc] init];
-    return bridge;
++ (id) javascriptBridge
+{
+    return [[[self alloc] init] autorelease];
+}
+
+- (id) init
+{
+    if ( (self = [super init]) )
+    {
+        self.startupMessageQueue = [[NSMutableArray new] autorelease];
+    }
+    
+    return self;
+}
+
+- (void) dealloc
+{
+    self.delegate = nil;
+    self.startupMessageQueue = nil;
+    
+    [super dealloc];
 }
 
-- (void)sendMessage:(NSString *)message {
-    if (startupMessageQueue) { [startupMessageQueue addObject:message]; }
-    else { [self _doSendMessage:message]; }
+- (void)sendMessage:(NSString *)message toWebView: (UIWebView *) theWebView {
+    if (self.startupMessageQueue) { [self.startupMessageQueue addObject:message]; }
+    else { [self _doSendMessage:message toWebView: theWebView]; }
 }
 
-- (void)_doSendMessage:(NSString *)message {
+- (void)_doSendMessage:(NSString *)message toWebView: (UIWebView *) aWebView {
 	message = [message stringByReplacingOccurrencesOfString:@"\\n" withString:@"\\\\n"];
 	message = [message stringByReplacingOccurrencesOfString:@"'" withString:@"\\'"];
 	message = [message stringByReplacingOccurrencesOfString:@"\"" withString:@"\\\""];
-    [webView stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"WebViewJavascriptBridge._handleMessageFromObjC('%@');", message]];
+    [aWebView stringByEvaluatingJavaScriptFromString:[NSString stringWithFormat:@"WebViewJavascriptBridge._handleMessageFromObjC('%@');", message]];
 }
 
 - (void)webViewDidFinishLoad:(UIWebView *)theWebView {
-    webView = theWebView;
     NSString* js;
     js = [NSString stringWithFormat:@";(function() {"
           "if (window.WebViewJavascriptBridge) { return; };"
@@ -92,12 +115,12 @@ - (void)webViewDidFinishLoad:(UIWebView *)theWebView {
           CUSTOM_PROTOCOL_SCHEME,
           QUEUE_HAS_MESSAGE];
     
-    [webView stringByEvaluatingJavaScriptFromString:js];
+    [theWebView stringByEvaluatingJavaScriptFromString:js];
     
-    for (id message in startupMessageQueue) {
-        [self _doSendMessage:message];
+    for (id message in self.startupMessageQueue) {
+        [self _doSendMessage:message toWebView: theWebView];
     }
-    startupMessageQueue = nil;
+    self.startupMessageQueue = nil;
 }
 
 
@@ -106,19 +129,19 @@ - (BOOL)webView:(UIWebView *)theWebView shouldStartLoadWithRequest:(NSURLRequest
     if (![[url scheme] isEqualToString:CUSTOM_PROTOCOL_SCHEME]) { return YES; }
 
     if ([[url host] isEqualToString:QUEUE_HAS_MESSAGE]) {
-        [self _flushMessageQueue];
+        [self _flushMessageQueueFromWebView: theWebView];
     } else {
         NSLog(@"WARNING: Received unknown WebViewJavascriptBridge command %@://%@", CUSTOM_PROTOCOL_SCHEME, [url path]);
     }
     
     return NO;
 }
 
-- (void) _flushMessageQueue {
-    NSString* messageQueueString = [webView stringByEvaluatingJavaScriptFromString:@"WebViewJavascriptBridge._fetchQueue();"];
+- (void) _flushMessageQueueFromWebView: (UIWebView *) theWebView {
+    NSString* messageQueueString = [theWebView stringByEvaluatingJavaScriptFromString:@"WebViewJavascriptBridge._fetchQueue();"];
     NSArray* messages = [messageQueueString componentsSeparatedByString:MESSAGE_SEPERATOR];
     for (id message in messages) {
-        [delegate handleMessage:message];
+        [self.delegate handleMessage:message fromWebView: theWebView];
     }
 }
 
diff --git a/WebViewJavascriptBridge/ExampleAppDelegate.m b/WebViewJavascriptBridge/ExampleAppDelegate.m
@@ -14,19 +14,20 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     webView = [[UIWebView alloc] initWithFrame:self.window.bounds];
     [self.window addSubview:webView];
 
-    javascriptBridge = [WebViewJavascriptBridge createWithDelegate:self];
+    javascriptBridge = [WebViewJavascriptBridge javascriptBridge];
+    javascriptBridge.delegate = self;
     webView.delegate = javascriptBridge;
 
-    [javascriptBridge sendMessage:@"HI"];
+    [javascriptBridge sendMessage:@"HI" toWebView: webView];
     
     [self loadExamplePage];
     
-    [javascriptBridge sendMessage:@"HI2"];
+    [javascriptBridge sendMessage:@"HI2" toWebView: webView];
 
     return YES;
 }
 
-- (void) handleMessage:(NSString *)message {
+- (void) handleMessage:(NSString *)message fromWebView:(UIWebView *)theWebView {
     NSLog(@"ExampleWebViewJavascriptBridgeDelegate received message: %@", message);
 }
 
@@ -54,7 +55,7 @@ - (void) loadExamplePage {
 }
 
 - (void)applicationWillResignActive:(UIApplication *)application
-{
+{    
     /*
      Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
      Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
