1.Redesign core bridge codes.

Example Apps/ExampleApp-OSX.xcodeproj/project.pbxproj

@@ -7,25 +7,18 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0ECB01491A0EEB3A0037FF4E /* WebViewJavascriptBridgeBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ECB01461A0EEB3A0037FF4E /* WebViewJavascriptBridgeBase.m */; };
-		0ECB014A1A0EEB3A0037FF4E /* WKWebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 0ECB01481A0EEB3A0037FF4E /* WKWebViewJavascriptBridge.m */; };
 		2C136A2517641106004C7401 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C136A2417641106004C7401 /* Cocoa.framework */; };
 		2C136A2F17641106004C7401 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2C136A2D17641106004C7401 /* InfoPlist.strings */; };
 		2C136A3117641106004C7401 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C136A3017641106004C7401 /* main.m */; };
 		2C136A3517641106004C7401 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2C136A3317641106004C7401 /* Credits.rtf */; };
 		2C136A3817641106004C7401 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C136A3717641106004C7401 /* AppDelegate.m */; };
 		2C136A4217641236004C7401 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C136A4117641236004C7401 /* WebKit.framework */; };
 		2C136A5A17642704004C7401 /* ExampleApp.html in Resources */ = {isa = PBXBuildFile; fileRef = 2C136A5917642704004C7401 /* ExampleApp.html */; };
-		2C1562C6176BA9FF00B4AE50 /* WebViewJavascriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C1562C4176BA9FF00B4AE50 /* WebViewJavascriptBridge.m */; };
-		2C3E7C491C5A8B8D00A1E322 /* WebViewJavascriptBridge_JS.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C3E7C481C5A8B8D00A1E322 /* WebViewJavascriptBridge_JS.m */; };
 		2CF17F5317D8AACF006E828B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2CF17F5217D8AACF006E828B /* MainMenu.xib */; };
+		EF5DC17623474A0A00F81F96 /* WKWebView+JavaScriptBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = EF5DC17523474A0A00F81F96 /* WKWebView+JavaScriptBridge.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		0ECB01451A0EEB3A0037FF4E /* WebViewJavascriptBridgeBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridgeBase.h; sourceTree = "<group>"; };
-		0ECB01461A0EEB3A0037FF4E /* WebViewJavascriptBridgeBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridgeBase.m; sourceTree = "<group>"; };
-		0ECB01471A0EEB3A0037FF4E /* WKWebViewJavascriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewJavascriptBridge.h; sourceTree = "<group>"; };
-		0ECB01481A0EEB3A0037FF4E /* WKWebViewJavascriptBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WKWebViewJavascriptBridge.m; sourceTree = "<group>"; };
 		2C136A2117641106004C7401 /* ExampleApp-OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ExampleApp-OSX.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2C136A2417641106004C7401 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		2C136A2717641106004C7401 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -40,11 +33,9 @@
 		2C136A3717641106004C7401 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		2C136A4117641236004C7401 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		2C136A5917642704004C7401 /* ExampleApp.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = ExampleApp.html; sourceTree = SOURCE_ROOT; };
-		2C1562C2176BA9FF00B4AE50 /* WebViewJavascriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridge.h; sourceTree = "<group>"; };
-		2C1562C4176BA9FF00B4AE50 /* WebViewJavascriptBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridge.m; sourceTree = "<group>"; };
-		2C3E7C471C5A8B8D00A1E322 /* WebViewJavascriptBridge_JS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewJavascriptBridge_JS.h; sourceTree = "<group>"; };
-		2C3E7C481C5A8B8D00A1E322 /* WebViewJavascriptBridge_JS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewJavascriptBridge_JS.m; sourceTree = "<group>"; };
 		2CF17F5217D8AACF006E828B /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
+		EF5DC17423474A0A00F81F96 /* WKWebView+JavaScriptBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WKWebView+JavaScriptBridge.h"; sourceTree = "<group>"; };
+		EF5DC17523474A0A00F81F96 /* WKWebView+JavaScriptBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "WKWebView+JavaScriptBridge.m"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -125,14 +116,8 @@
 		2C1562C1176BA9FF00B4AE50 /* WebViewJavascriptBridge */ = {
 			isa = PBXGroup;
 			children = (
-				2C3E7C471C5A8B8D00A1E322 /* WebViewJavascriptBridge_JS.h */,
-				2C3E7C481C5A8B8D00A1E322 /* WebViewJavascriptBridge_JS.m */,
-				0ECB01451A0EEB3A0037FF4E /* WebViewJavascriptBridgeBase.h */,
-				0ECB01461A0EEB3A0037FF4E /* WebViewJavascriptBridgeBase.m */,
-				0ECB01471A0EEB3A0037FF4E /* WKWebViewJavascriptBridge.h */,
-				0ECB01481A0EEB3A0037FF4E /* WKWebViewJavascriptBridge.m */,
-				2C1562C2176BA9FF00B4AE50 /* WebViewJavascriptBridge.h */,
-				2C1562C4176BA9FF00B4AE50 /* WebViewJavascriptBridge.m */,
+				EF5DC17423474A0A00F81F96 /* WKWebView+JavaScriptBridge.h */,
+				EF5DC17523474A0A00F81F96 /* WKWebView+JavaScriptBridge.m */,
 			);
 			name = WebViewJavascriptBridge;
 			path = ../../WebViewJavascriptBridge;
@@ -172,6 +157,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 2C136A1817641106004C7401;
@@ -203,11 +189,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0ECB01491A0EEB3A0037FF4E /* WebViewJavascriptBridgeBase.m in Sources */,
-				0ECB014A1A0EEB3A0037FF4E /* WKWebViewJavascriptBridge.m in Sources */,
-				2C3E7C491C5A8B8D00A1E322 /* WebViewJavascriptBridge_JS.m in Sources */,
+				EF5DC17623474A0A00F81F96 /* WKWebView+JavaScriptBridge.m in Sources */,
 				2C136A3117641106004C7401 /* main.m in Sources */,
-				2C1562C6176BA9FF00B4AE50 /* WebViewJavascriptBridge.m in Sources */,
 				2C136A3817641106004C7401 /* AppDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Example Apps/ExampleApp-OSX/AppDelegate.m

@@ -8,69 +8,27 @@
 
 #import "AppDelegate.h"
 #import <WebKit/WebKit.h>
-#import "WebViewJavascriptBridge.h"
+#import "WKWebView+JavaScriptBridge.h"
 
 @implementation AppDelegate {
-    WebView* _webView;
     WKWebView *_WKWebView;
-    WebViewJavascriptBridge* _bridge;
-    WebViewJavascriptBridge* _WKBridge;
     NSView* _WKWebViewWrapper;
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
     [self _createViews];
-    [self _configureWebview];
     [self _configureWKWebview];
 }
 
-- (void)_configureWebview {
-    // Create Bridge
-    _bridge = [WebViewJavascriptBridge bridgeForWebView:_webView];
-
-    [_bridge registerHandler:@"testObjcCallback" handler:^(id data, WVJBResponseCallback responseCallback) {
-        NSLog(@"testObjcCallback called: %@", data);
-        responseCallback(@"Response from testObjcCallback");
-    }];
-
-    [_bridge callHandler:@"testJavascriptHandler" data:@{ @"foo":@"before ready" }];
-
-    // Create Buttons
-    NSButton *callbackButton = [[NSButton alloc] initWithFrame:NSMakeRect(5, 0, 120, 40)];
-    [callbackButton setTitle:@"Call handler"];
-    [callbackButton setBezelStyle:NSRoundedBezelStyle];
-    [callbackButton setTarget:self];
-    [callbackButton setAction:@selector(_callHandler)];
-    [_webView addSubview:callbackButton];
-
-    NSButton *webViewToggleButton = [[NSButton alloc] initWithFrame:NSMakeRect(120, 0, 180, 40)];
-    [webViewToggleButton setTitle:@"Switch to WKWebView"];
-    [webViewToggleButton setBezelStyle:NSRoundedBezelStyle];
-    [webViewToggleButton setTarget:self];
-    [webViewToggleButton setAction:@selector(_toggleExample)];
-    [_webView addSubview:webViewToggleButton];
-
-
-    // Load Page
-    NSString* htmlPath = [[NSBundle mainBundle] pathForResource:@"ExampleApp" ofType:@"html"];
-    NSString* html = [NSString stringWithContentsOfFile:htmlPath encoding:NSUTF8StringEncoding error:nil];
-    NSURL *baseURL = [NSURL fileURLWithPath:htmlPath];
-    [[_webView mainFrame] loadHTMLString:html baseURL: baseURL];
-}
-
-
 - (void)_configureWKWebview {
     // Create Bridge
-    _WKBridge = [WebViewJavascriptBridge bridgeForWebView:_WKWebView];
-
-    [_WKBridge registerHandler:@"testObjcCallback" handler:^(id data, WVJBResponseCallback responseCallback) {
+    [WKWebView enableLogging:LogginglevelAll];
+    [_WKWebView registerHandler:@"testObjcCallback" handler:^(id data, WVJBResponseCallback responseCallback) {
         NSLog(@"testObjcCallback called: %@", data);
         responseCallback(@"Response from testObjcCallback");
     }];
 
-    [_WKBridge callHandler:@"testJavascriptHandler" data:@{ @"foo":@"before ready" }];
-
     // Create Buttons
     NSButton *callbackButton = [[NSButton alloc] initWithFrame:NSMakeRect(5, 0, 120, 40)];
     [callbackButton setTitle:@"Call handler"];
@@ -79,52 +37,28 @@ - (void)_configureWKWebview {
     [callbackButton setAction:@selector(_WKCallHandler)];
     [_WKWebView addSubview:callbackButton];
 
-    NSButton *webViewToggleButton = [[NSButton alloc] initWithFrame:NSMakeRect(120, 0, 180, 40)];
-    [webViewToggleButton setTitle:@"Switch to WebView"];
-    [webViewToggleButton setBezelStyle:NSRoundedBezelStyle];
-    [webViewToggleButton setTarget:self];
-    [webViewToggleButton setAction:@selector(_toggleExample)];
-    [_WKWebView addSubview:webViewToggleButton];
 
     // Load Page
     NSString* htmlPath = [[NSBundle mainBundle] pathForResource:@"ExampleApp" ofType:@"html"];
     NSString* html = [NSString stringWithContentsOfFile:htmlPath encoding:NSUTF8StringEncoding error:nil];
     NSURL *baseURL = [NSURL fileURLWithPath:htmlPath];
     [_WKWebView loadHTMLString:html baseURL:baseURL];
 }
-
--(void)_toggleExample {
-    _WKWebView.hidden = !_WKWebView.isHidden;
-    _webView.hidden = !_webView.isHidden;
-}
-
-- (void)_callHandler {
-    id data = @{ @"greetingFromObjC": @"Hi there, JS!" };
-    [_bridge callHandler:@"testJavascriptHandler" data:data responseCallback:^(id response) {
-        NSLog(@"testJavascriptHandler responded: %@", response);
-    }];
-}
-
 - (void)_WKCallHandler {
     id data = @{ @"greetingFromObjC": @"Hi there, JS!" };
-    [_WKBridge callHandler:@"testJavascriptHandler" data:data responseCallback:^(id response) {
+    [_WKWebView callHandler:@"testJavascriptHandler" data:data responseCallback:^(id response) {
         NSLog(@"testJavascriptHandler responded: %@", response);
     }];
 }
 
 - (void)_createViews {
     NSView* contentView = _window.contentView;
-    // WebView
-    _webView = [[WebView alloc] initWithFrame:contentView.frame];
-    [_webView setAutoresizingMask:(NSViewHeightSizable | NSViewWidthSizable)];
-    _webView.hidden = YES;
-
     // WKWebView
-    _WKWebView = [[WKWebView alloc] initWithFrame:contentView.frame];
+    WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
+    _WKWebView = [[WKWebView alloc] initWithFrame:contentView.frame configuration:config];
     [_WKWebView setAutoresizingMask:(NSViewHeightSizable | NSViewWidthSizable)];
 
     [contentView addSubview:_WKWebView];
-    [contentView addSubview:_webView];
 }