Update demo

DavinAhn · DavinAhn · commit 2e0b98735e2e · 2017-01-19T11:50:36.000+09:00
diff --git a/WKJavaScriptController-Demo/WKJavaScriptController-Demo/ViewController.swift b/WKJavaScriptController-Demo/WKJavaScriptController-Demo/ViewController.swift
@@ -10,34 +10,62 @@ import UIKit
 import WebKit
 import WKJavaScriptController
 
+// Create protocol.
+// '@objc' keyword is required. because method call is based on ObjC.
 @objc protocol JavaScriptInterface {
     func onSubmit(_ dictonary: [String: AnyObject])
     func onSubmit(_ dictonary: [String: AnyObject], clear: JSBool)
     func onSubmit(_ email: String, firstName: String, lastName: String, address1: String, address2: String, zipCode: JSInt, phoneNumber: String)
     func onCancel()
 }
 
+// Implement protocol.
+extension ViewController: JavaScriptInterface {
+    func onSubmit(_ dictonary: [String: AnyObject]) {
+        NSLog("onSubmit \(dictonary)")
+    }
+    
+    func onSubmit(_ dictonary: [String: AnyObject], clear: JSBool) {
+        NSLog("onSubmit \(dictonary)")
+        if clear.value {
+            webView.evaluateJavaScript("clearAll()", completionHandler: nil)
+        }
+    }
+    
+    func onSubmit(_ email: String, firstName: String, lastName: String, address1: String, address2: String, zipCode: JSInt, phoneNumber: String) {
+        NSLog("onSubmit \(email), \(firstName), \(lastName), \(address1), \(address2), \(zipCode.value), \(phoneNumber)")
+    }
+    
+    func onCancel() {
+        NSLog("onCancel")
+    }
+}
+
 class ViewController: UIViewController {
     fileprivate var webView: WKWebView!
     
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
         if webView == nil {
+            // Create javaScriptController.
             let javaScriptController = WKJavaScriptController(name: "native", target: self, bridgeProtocol: JavaScriptInterface.self)
             
+            // [Optional] Add your javascript.
             let jsPath = Bundle.main.path(forResource: "index", ofType: "js")!
             let jsString = try! String(contentsOfFile: jsPath, encoding: String.Encoding.utf8)
             let userScript = WKUserScript(source: jsString, injectionTime: .atDocumentEnd, forMainFrameOnly: true)
             javaScriptController.addUserScript(userScript)
             
             webView = WKWebView(frame: view.frame)
-            webView.javaScriptController = javaScriptController
             view.addSubview(webView)
             
+            // Assign javaScriptController.
+            webView.javaScriptController = javaScriptController
+            
             let htmlPath = Bundle.main.path(forResource: "index", ofType: "html")!
             let htmlString = try! String(contentsOfFile: htmlPath, encoding: String.Encoding.utf8)
-            webView.prepareForJavaScriptController()
+            webView.prepareForJavaScriptController() // Call prepareForJavaScriptController before initializing WKWebView or loading page.
             webView.loadHTMLString(htmlString, baseURL: Bundle.main.bundleURL)
         }
     }
@@ -46,26 +74,3 @@ class ViewController: UIViewController {
         return true
     }
 }
-
-// MARK: - JavaScriptInterface
-
-extension ViewController: JavaScriptInterface {
-    func onSubmit(_ dictonary: [String: AnyObject]) {
-        NSLog("onSubmit \(dictonary)")
-    }
-    
-    func onSubmit(_ dictonary: [String: AnyObject], clear: JSBool) {
-        NSLog("onSubmit \(dictonary)")
-        if clear.value {
-            webView.evaluateJavaScript("clearAll()", completionHandler: nil)
-        }
-    }
-    
-    func onSubmit(_ email: String, firstName: String, lastName: String, address1: String, address2: String, zipCode: JSInt, phoneNumber: String) {
-        NSLog("onSubmit \(email), \(firstName), \(lastName), \(address1), \(address2), \(zipCode.value), \(phoneNumber)")
-    }
-    
-    func onCancel() {
-        NSLog("onCancel")
-    }
-}
diff --git a/WKJavaScriptController/WKJavaScriptController.swift b/WKJavaScriptController/WKJavaScriptController.swift
@@ -179,7 +179,7 @@ open class WKJavaScriptController: NSObject {
                     }
                     
                     bridgeList.append(bridge)
-                    log("Read \(bridge.nativeSelector) -> \(bridge.jsSelector)")
+                    log("Parsed \(bridge.nativeSelector) -> \(bridge.jsSelector)")
                 }
                 free(methodList)
             }
@@ -270,17 +270,17 @@ extension WKJavaScriptController: WKScriptMessageHandler {
         func cast(_ arg: Arg) -> Arg {
             if let number = arg as? NSNumber,
                 let type = String(cString: number.objCType, encoding: String.Encoding.utf8) {
-                switch type {
-                case "c", "C", "B":
-                    return JSBool(value: number)
-                default:
-                    if number.stringValue.range(of: ".") != nil {
-                        return JSFloat(value: number)
-                    } else if number.stringValue == "nan" {
-                        return JSInt(value: NSNumber(value: 0 as Int))
+                    switch type {
+                    case "c", "C", "B":
+                        return JSBool(value: number)
+                    default:
+                        if number.stringValue.range(of: ".") != nil {
+                            return JSFloat(value: number)
+                        } else if number.stringValue == "nan" {
+                            return JSInt(value: NSNumber(value: 0 as Int))
+                        }
+                        return JSInt(value: number)
                     }
-                    return JSInt(value: number)
-                }
             }
             return arg
         }
