Both examples working without any immediate bugs

lokimeyburg · lokimeyburg · commit e2bdcf5da474 · 2014-11-08T16:06:45.000-08:00
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.h b/WebViewJavascriptBridge/WebViewJavascriptBridge.h
@@ -8,9 +8,6 @@
 
 #import <Foundation/Foundation.h>
 
-#define kCustomProtocolScheme @"wvjbscheme"
-#define kQueueHasMessage      @"__WVJB_QUEUE_MESSAGE__"
-
 #if defined __MAC_OS_X_VERSION_MAX_ALLOWED
     #import <WebKit/WebKit.h>
     #define WVJB_PLATFORM_OSX
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m
@@ -29,6 +29,8 @@ -(id)initWithWebViewType:(NSString*)webViewType handler:(WVJBHandler)messageHand
     _resourceBundle = bundle;
     self.messageHandler = messageHandler;
     self.messageHandlers = [NSMutableDictionary dictionary];
+    self.startupMessageQueue = [NSMutableArray array];
+    self.responseCallbacks = [NSMutableDictionary dictionary];
     _uniqueId = 0;
     return(self);
 }
@@ -184,11 +186,14 @@ - (void)injectJavascriptFile:(BOOL)shouldInject {
 }
 
 - (void) dispatchStartUpMessageQueue {
-    if (_startupMessageQueue) {
-        for (id queuedMessage in _startupMessageQueue) {
+    NSLog(@"0. Dispathing queue");
+    if (self.startupMessageQueue) {
+        NSLog(@"1. Startup queue found");
+        
+        for (id queuedMessage in self.startupMessageQueue) {
             [self _dispatchMessage:queuedMessage];
         }
-        _startupMessageQueue = nil;
+        self.startupMessageQueue = nil;
     }
 }
 
@@ -211,7 +216,7 @@ -(BOOL)correctHost:(NSURL*)url {
 
 
 -(void) logUnkownMessageFor:(NSURL*)url {
-    NSLog(@"WebViewJavascriptBridge: WARNING: Received unknown WKWebViewJavascriptBridge command %@://%@", kCustomProtocolScheme, [url path]);
+    NSLog(@"WebViewJavascriptBridge: WARNING: Received unknown WebViewJavascriptBridge command %@://%@", kCustomProtocolScheme, [url path]);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ -(id)initWithWebViewType:(NSString*)webViewType handler:(WVJBHandler)messageHand`
`29`	`29`	`_resourceBundle = bundle;`
`30`	`30`	`self.messageHandler = messageHandler;`
`31`	`31`	`self.messageHandlers = [NSMutableDictionary dictionary];`
	`32`	`+ self.startupMessageQueue = [NSMutableArray array];`
	`33`	`+ self.responseCallbacks = [NSMutableDictionary dictionary];`
`32`	`34`	`_uniqueId = 0;`
`33`	`35`	`return(self);`
`34`	`36`	`}`
`@@ -184,11 +186,14 @@ - (void)injectJavascriptFile:(BOOL)shouldInject {`
`184`	`186`	`}`
`185`	`187`
`186`	`188`	`- (void) dispatchStartUpMessageQueue {`
`187`		`- if (_startupMessageQueue) {`
`188`		`- for (id queuedMessage in _startupMessageQueue) {`
	`189`	`+ NSLog(@"0. Dispathing queue");`
	`190`	`+ if (self.startupMessageQueue) {`
	`191`	`+ NSLog(@"1. Startup queue found");`
	`192`	`+`
	`193`	`+ for (id queuedMessage in self.startupMessageQueue) {`
`189`	`194`	`[self _dispatchMessage:queuedMessage];`
`190`	`195`	`}`
`191`		`- _startupMessageQueue = nil;`
	`196`	`+ self.startupMessageQueue = nil;`
`192`	`197`	`}`
`193`	`198`	`}`
`194`	`199`
`@@ -211,7 +216,7 @@ -(BOOL)correctHost:(NSURL*)url {`
`211`	`216`
`212`	`217`
`213`	`218`	`-(void) logUnkownMessageFor:(NSURL*)url {`
`214`		`- NSLog(@"WebViewJavascriptBridge: WARNING: Received unknown WKWebViewJavascriptBridge command %@://%@", kCustomProtocolScheme, [url path]);`
	`219`	`+ NSLog(@"WebViewJavascriptBridge: WARNING: Received unknown WebViewJavascriptBridge command %@://%@", kCustomProtocolScheme, [url path]);`
`215`	`220`	`}`
`216`	`221`
`217`	`222`