File tree Expand file tree Collapse file tree 3 files changed +5
-19
lines changed Expand file tree Collapse file tree 3 files changed +5
-19
lines changed Original file line number Diff line number Diff line change 3030- [ ] Style consistency through all code
3131- [ ] Test pod
3232- [ ] Fix OSX lint warnings (` pod spec lint ` )
33- - [ ] I believe ` receiveMessageQueue ` in JS is no longer needed, since the JS explicitly tells ObjC when to start sending messages. Remove?
33+ - [X ] I believe ` receiveMessageQueue ` in JS is no longer needed, since the JS explicitly tells ObjC when to start sending messages. Remove?
3434
3535v5.0.1
3636------
Original file line number Diff line number Diff line change @@ -111,15 +111,12 @@ - (void)flushMessageQueue:(NSString *)messageQueueString{
111111- (void )injectJavascriptFile {
112112 NSString *js = WebViewJavascriptBridge_js ();
113113 [self _evaluateJavascript: js];
114- [self _dispatchStartUpMessageQueue ];
115- }
116-
117- - (void )_dispatchStartUpMessageQueue {
118114 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) {
120118 [self _dispatchMessage: queuedMessage];
121119 }
122- self.startupMessageQueue = nil ;
123120 }
124121}
125122
Original file line number Diff line number Diff line change 2828
2929 var messagingIframe;
3030 var sendMessageQueue = [];
31- var receiveMessageQueue = [];
3231 var messageHandlers = {};
3332
3433 var CUSTOM_PROTOCOL_SCHEME = ' wvjbscheme' ;
@@ -95,24 +94,14 @@ function _dispatchMessageFromObjC(messageJSON) {
9594 }
9695
9796 function _handleMessageFromObjC (messageJSON) {
98- if (receiveMessageQueue) {
99- receiveMessageQueue.push (messageJSON);
100- } else {
101- _dispatchMessageFromObjC (messageJSON);
102- }
97+ _dispatchMessageFromObjC (messageJSON);
10398 }
10499
105100 messagingIframe = document.createElement (' iframe' );
106101 messagingIframe.style .display = ' none' ;
107102 messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + ' ://' + QUEUE_HAS_MESSAGE;
108103 document.documentElement .appendChild (messagingIframe);
109104
110- var receivedMessages = receiveMessageQueue;
111- receiveMessageQueue = null;
112- for (var i=0 ; i<receivedMessages.length ; i++) {
113- _dispatchMessageFromObjC (receivedMessages[i]);
114- }
115-
116105 setTimeout (_callWVJBCallbacks, 0 );
117106 function _callWVJBCallbacks () {
118107 var callbacks = window.WVJBCallbacks ;
You can’t perform that action at this time.
0 commit comments