Use semi-colon for statement delimination instead of newlines, in preparation for merging in marcuswestin#129 which inlines the javascript source via a .m file preprocessor macro

Author: marcuswestin

WebViewJavascriptBridge/WebViewJavascriptBridge.js.txt

@@ -1,117 +1,123 @@
 ;(function() {
-	if (window.WebViewJavascriptBridge) { return }
-	var messagingIframe
-	var sendMessageQueue = []
-	var receiveMessageQueue = []
-	var messageHandlers = {}
+	if (window.WebViewJavascriptBridge) {
+		return;
+	}
+	window.WebViewJavascriptBridge = {
+		init: init,
+		send: send,
+		registerHandler: registerHandler,
+		callHandler: callHandler,
+		_fetchQueue: _fetchQueue,
+		_handleMessageFromObjC: _handleMessageFromObjC
+	};
+
+	var messagingIframe;
+	var sendMessageQueue = [];
+	var receiveMessageQueue = [];
+	var messageHandlers = {};
 
-	var CUSTOM_PROTOCOL_SCHEME = 'wvjbscheme'
-	var QUEUE_HAS_MESSAGE = '__WVJB_QUEUE_MESSAGE__'
+	var CUSTOM_PROTOCOL_SCHEME = 'wvjbscheme';
+	var QUEUE_HAS_MESSAGE = '__WVJB_QUEUE_MESSAGE__';
 
-	var responseCallbacks = {}
-	var uniqueId = 1
+	var responseCallbacks = {};
+	var uniqueId = 1;
 
 	function _createQueueReadyIframe(doc) {
-		messagingIframe = doc.createElement('iframe')
-		messagingIframe.style.display = 'none'
-		messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE
-		doc.documentElement.appendChild(messagingIframe)
+		messagingIframe = doc.createElement('iframe');
+		messagingIframe.style.display = 'none';
+		messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE;
+		doc.documentElement.appendChild(messagingIframe);
 	}
 
 	function init(messageHandler) {
-		if (WebViewJavascriptBridge._messageHandler) { throw new Error('WebViewJavascriptBridge.init called twice') }
-		WebViewJavascriptBridge._messageHandler = messageHandler
-		var receivedMessages = receiveMessageQueue
-		receiveMessageQueue = null
+		if (WebViewJavascriptBridge._messageHandler) {
+			throw new Error('WebViewJavascriptBridge.init called twice');
+		}
+		WebViewJavascriptBridge._messageHandler = messageHandler;
+		var receivedMessages = receiveMessageQueue;
+		receiveMessageQueue = null;
 		for (var i=0; i<receivedMessages.length; i++) {
-			_dispatchMessageFromObjC(receivedMessages[i])
+			_dispatchMessageFromObjC(receivedMessages[i]);
 		}
 	}
 
 	function send(data, responseCallback) {
-		_doSend({ data:data }, responseCallback)
+		_doSend({ data:data }, responseCallback);
 	}
 
 	function registerHandler(handlerName, handler) {
-		messageHandlers[handlerName] = handler
+		messageHandlers[handlerName] = handler;
 	}
 
 	function callHandler(handlerName, data, responseCallback) {
-		_doSend({ handlerName:handlerName, data:data }, responseCallback)
+		_doSend({ handlerName:handlerName, data:data }, responseCallback);
 	}
 
 	function _doSend(message, responseCallback) {
 		if (responseCallback) {
-			var callbackId = 'cb_'+(uniqueId++)+'_'+new Date().getTime()
-			responseCallbacks[callbackId] = responseCallback
-			message['callbackId'] = callbackId
+			var callbackId = 'cb_'+(uniqueId++)+'_'+new Date().getTime();
+			responseCallbacks[callbackId] = responseCallback;
+			message['callbackId'] = callbackId;
 		}
-		sendMessageQueue.push(message)
-		messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE
+		sendMessageQueue.push(message);
+		messagingIframe.src = CUSTOM_PROTOCOL_SCHEME + '://' + QUEUE_HAS_MESSAGE;
 	}
 
 	function _fetchQueue() {
-		var messageQueueString = JSON.stringify(sendMessageQueue)
-		sendMessageQueue = []
-		return messageQueueString
+		var messageQueueString = JSON.stringify(sendMessageQueue);
+		sendMessageQueue = [];
+		return messageQueueString;
 	}
 
 	function _dispatchMessageFromObjC(messageJSON) {
 		setTimeout(function _timeoutDispatchMessageFromObjC() {
-			var message = JSON.parse(messageJSON)
-			var messageHandler
-			var responseCallback
+			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]
+				responseCallback = responseCallbacks[message.responseId];
+				if (!responseCallback) {
+					return;
+				}
+				responseCallback(message.responseData);
+				delete responseCallbacks[message.responseId];
 			} else {
 				if (message.callbackId) {
-					var callbackResponseId = message.callbackId
+					var callbackResponseId = message.callbackId;
 					responseCallback = function(responseData) {
-						_doSend({ responseId:callbackResponseId, responseData:responseData })
-					}
+						_doSend({ responseId:callbackResponseId, responseData:responseData });
+					};
 				}
 
-				var handler = WebViewJavascriptBridge._messageHandler
+				var handler = WebViewJavascriptBridge._messageHandler;
 				if (message.handlerName) {
-					handler = messageHandlers[message.handlerName]
+					handler = messageHandlers[message.handlerName];
 				}
 
 				try {
-					handler(message.data, responseCallback)
+					handler(message.data, responseCallback);
 				} catch(exception) {
 					if (typeof console != 'undefined') {
-						console.log("WebViewJavascriptBridge: WARNING: javascript handler threw.", message, exception)
+						console.log("WebViewJavascriptBridge: WARNING: javascript handler threw.", message, exception);
 					}
 				}
 			}
-		})
+		});
 	}
 
 	function _handleMessageFromObjC(messageJSON) {
 		if (receiveMessageQueue) {
-			receiveMessageQueue.push(messageJSON)
+			receiveMessageQueue.push(messageJSON);
 		} else {
-			_dispatchMessageFromObjC(messageJSON)
+			_dispatchMessageFromObjC(messageJSON);
 		}
 	}
 
-	window.WebViewJavascriptBridge = {
-		init: init,
-		send: send,
-		registerHandler: registerHandler,
-		callHandler: callHandler,
-		_fetchQueue: _fetchQueue,
-		_handleMessageFromObjC: _handleMessageFromObjC
-	}
-
-	var doc = document
-	_createQueueReadyIframe(doc)
-	var readyEvent = doc.createEvent('Events')
-	readyEvent.initEvent('WebViewJavascriptBridgeReady')
-	readyEvent.bridge = WebViewJavascriptBridge
-	doc.dispatchEvent(readyEvent)
+	var doc = document;
+	_createQueueReadyIframe(doc);
+	var readyEvent = doc.createEvent('Events');
+	readyEvent.initEvent('WebViewJavascriptBridgeReady');
+	readyEvent.bridge = WebViewJavascriptBridge;
+	doc.dispatchEvent(readyEvent);
 })();