Remove receiveMessageQueue, since it is no longer needed

marcuswestin · marcuswestin · commit 0ce4dbcfe865 · 2016-01-28T22:00:45.000-05:00
diff --git a/Roadmap.md b/Roadmap.md
@@ -30,7 +30,7 @@ Misc
 - [ ] Style consistency through all code
 - [ ] Test pod
 - [ ] Fix OSX lint warnings (`pod spec lint`)
-- [ ] I believe `receiveMessageQueue` in JS is no longer needed, since the JS explicitly tells ObjC when to start sending messages. Remove?
+- [X] I believe `receiveMessageQueue` in JS is no longer needed, since the JS explicitly tells ObjC when to start sending messages. Remove?
 
 v5.0.1
 ------
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m
@@ -111,15 +111,12 @@ - (void)flushMessageQueue:(NSString *)messageQueueString{
 - (void)injectJavascriptFile {
     NSString *js = WebViewJavascriptBridge_js();
     [self _evaluateJavascript:js];
-    [self _dispatchStartUpMessageQueue];
-}
-
-- (void)_dispatchStartUpMessageQueue {
     if (self.startupMessageQueue) {
-        for (id queuedMessage in self.startupMessageQueue) {
+        NSArray* queue = self.startupMessageQueue;
+        self.startupMessageQueue = nil;
+        for (id queuedMessage in queue) {
             [self _dispatchMessage:queuedMessage];
         }
-        self.startupMessageQueue = nil;
     }
 }
 
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m b/WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m
@@ -28,7 +28,6 @@
 
 	var messagingIframe;
 	var sendMessageQueue = [];
-	var receiveMessageQueue = [];
 	var messageHandlers = {};
 	
 	var CUSTOM_PROTOCOL_SCHEME = 'wvjbscheme';
@@ -95,24 +94,14 @@ function _dispatchMessageFromObjC(messageJSON) {
 	}
 	
 	function _handleMessageFromObjC(messageJSON) {
-		if (receiveMessageQueue) {
-			receiveMessageQueue.push(messageJSON);
-		} else {
-			_dispatchMessageFromObjC(messageJSON);
-		}
+        _dispatchMessageFromObjC(messageJSON);
 	}
 
 	messagingIframe = document.createElement('iframe');
 	messagingIframe.style.display = 'none';
 	messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE;
 	document.documentElement.appendChild(messagingIframe);
 
-	var receivedMessages = receiveMessageQueue;
-	receiveMessageQueue = null;
-	for (var i=0; i<receivedMessages.length; i++) {
-		_dispatchMessageFromObjC(receivedMessages[i]);
-	}
-
 	setTimeout(_callWVJBCallbacks, 0);
 	function _callWVJBCallbacks() {
 		var callbacks = window.WVJBCallbacks;

Original file line number	Diff line number	Diff line change
`@@ -111,15 +111,12 @@ - (void)flushMessageQueue:(NSString *)messageQueueString{`
`111`	`111`	`- (void)injectJavascriptFile {`
`112`	`112`	`NSString *js = WebViewJavascriptBridge_js();`
`113`	`113`	`[self _evaluateJavascript:js];`
`114`		`- [self _dispatchStartUpMessageQueue];`
`115`		`-}`
`116`		`-`
`117`		`-- (void)_dispatchStartUpMessageQueue {`
`118`	`114`	`if (self.startupMessageQueue) {`
`119`		`- for (id queuedMessage in self.startupMessageQueue) {`
	`115`	`+ NSArray* queue = self.startupMessageQueue;`
	`116`	`+ self.startupMessageQueue = nil;`
	`117`	`+ for (id queuedMessage in queue) {`
`120`	`118`	`[self _dispatchMessage:queuedMessage];`
`121`	`119`	`}`
`122`		`- self.startupMessageQueue = nil;`
`123`	`120`	`}`
`124`	`121`	`}`
`125`	`122`