Both examples working without any immediate bugs

Lxg1582 · Nov 9, 2014 · e2bdcf5 · e2bdcf5
1 parent 7382589
commit e2bdcf5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
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]);
 }