rm js redundant code

Author: Lision

WKWebViewJavascriptBridgeDemo/Demo.html

@@ -18,14 +18,7 @@ <h1>Demo</h1>
         if (window.WKWebViewJavascriptBridge) { return callback(WKWebViewJavascriptBridge); }
         if (window.WKWVJBCallbacks) { return window.WKWVJBCallbacks.push(callback); }
         window.WKWVJBCallbacks = [callback];
-        
-<!--        var WVJBIframe = document.createElement('iframe');-->
-<!--        WVJBIframe.style.display = 'none';-->
-<!--        WVJBIframe.src = 'https://__bridge_loaded__';-->
-<!--        document.documentElement.appendChild(WVJBIframe);-->
         window.webkit.messageHandlers.iOS_Native_InjectJavascript.postMessage(null)
-
-<!--        setTimeout(function() { document.documentElement.removeChild(WVJBIframe) }, 0)-->
     }
 
     setupWKWebViewJavascriptBridge(function(bridge) {
@@ -72,21 +65,15 @@ <h1>Demo</h1>
       window.WKWebViewJavascriptBridge = {
           registerHandler: registerHandler,
           callHandler: callHandler,
-          disableJavscriptAlertBoxSafetyTimeout: disableJavscriptAlertBoxSafetyTimeout,
           _fetchQueue: _fetchQueue,
           _handleMessageFromiOS: _handleMessageFromiOS
       };
 
-      var messagingIframe;
       var sendMessageQueue = [];
       var messageHandlers = {};
 
-      var CUSTOM_PROTOCOL_SCHEME = 'https';
-      var QUEUE_HAS_MESSAGE = '__wvjb_queue_message__';
-      
       var responseCallbacks = {};
       var uniqueId = 1;
-      var dispatchMessagesWithTimeoutSafety = true;
 
       function registerHandler(handlerName, handler) {
           messageHandlers[handlerName] = handler;
@@ -99,9 +86,6 @@ <h1>Demo</h1>
           }
           _doSend({ handlerName:handlerName, data:data }, responseCallback);
       }
-      function disableJavscriptAlertBoxSafetyTimeout() {
-          dispatchMessagesWithTimeoutSafety = false;
-      }
 
       function _doSend(message, responseCallback) {
           if (responseCallback) {
@@ -110,8 +94,6 @@ <h1>Demo</h1>
               message['callbackID'] = callbackID;
           }
           sendMessageQueue.push(message);
-      
-<!--          messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE;-->
           window.webkit.messageHandlers.iOS_Native_FlushMessageQueue.postMessage(null)
       }
 
@@ -122,38 +104,30 @@ <h1>Demo</h1>
       }
 
       function _dispatchMessageFromiOS(messageJSON) {
-          if (dispatchMessagesWithTimeoutSafety) {
-              setTimeout(_doDispatchMessageFromiOS);
+          var message = JSON.parse(messageJSON);
+          var messageHandler;
+          var responseCallback;
+  
+          if (message.responseID) {
+              responseCallback = responseCallbacks[message.responseID];
+              if (!responseCallback) {
+                  return;
+              }
+              responseCallback(message.responseData);
+              delete responseCallbacks[message.responseID];
           } else {
-              _doDispatchMessageFromiOS();
-          }
-      
-          function _doDispatchMessageFromiOS() {
-              var message = JSON.parse(messageJSON);
-              var messageHandler;
-              var responseCallback;
-      
-              if (message.responseID) {
-                  responseCallback = responseCallbacks[message.responseID];
-                  if (!responseCallback) {
-                      return;
-                  }
-                  responseCallback(message.responseData);
-                  delete responseCallbacks[message.responseID];
+              if (message.callbackID) {
+                  var callbackResponseId = message.callbackID;
+                  responseCallback = function(responseData) {
+                      _doSend({ handlerName:message.handlerName, responseID:callbackResponseId, responseData:responseData });
+                  };
+              }
+  
+              var handler = messageHandlers[message.handlerName];
+              if (!handler) {
+                  console.log("WKWebViewJavascriptBridge: WARNING: no handler for message from iOS:", message);
               } else {
-                  if (message.callbackID) {
-                      var callbackResponseId = message.callbackID;
-                      responseCallback = function(responseData) {
-                          _doSend({ handlerName:message.handlerName, responseID:callbackResponseId, responseData:responseData });
-                      };
-                  }
-      
-                  var handler = messageHandlers[message.handlerName];
-                  if (!handler) {
-                      console.log("WKWebViewJavascriptBridge: WARNING: no handler for message from iOS:", message);
-                  } else {
-                      handler(message.data, responseCallback);
-                  }
+                  handler(message.data, responseCallback);
               }
           }
       }
@@ -162,18 +136,11 @@ <h1>Demo</h1>
           _dispatchMessageFromiOS(messageJSON);
       }
 
-      messagingIframe = document.createElement('iframe');
-      messagingIframe.style.display = 'none';
-      messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE;
-      document.documentElement.appendChild(messagingIframe);
-      
-      registerHandler("_disableJavascriptAlertBoxSafetyTimeout", disableJavscriptAlertBoxSafetyTimeout);
-      
       setTimeout(_callWVJBCallbacks, 0);
       function _callWVJBCallbacks() {
           var callbacks = window.WKWVJBCallbacks;
           delete window.WKWVJBCallbacks;
-          for (var i=0; i<callbacks.length; i++) {
+          for (var i = 0; i < callbacks.length; i++) {
               callbacks[i](WKWebViewJavascriptBridge);
           }
       }