Added function execution to client on return message

pennyfx · Aug 15, 2010 · 46fd0e3 · 46fd0e3
1 parent f1941b7
commit 46fd0e3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/static/client.html b/static/client.html
@@ -11,7 +11,11 @@ <h2 id="pageName">Parent page</h2>
     <script>
       var client = new ArcClient("http://localhost:8081/static/server.html");
 
-       client.sendMessage('test',null,null);
+       client.sendMessage('test',function(data){
+
+        console.log("message sent back from server" + data);
+
+       },null);
 
     </script>
   </body>

diff --git a/static/js/arc_client.js b/static/js/arc_client.js
@@ -6,6 +6,7 @@
 
 		var self = this;
 		this.queue = new Array();
+        this.requests = new Object();
 		this.iFrame = document.createElement('iframe');
 		this.iFrame.src = url;
         this.frameLoaded = false;
@@ -35,10 +36,10 @@
 	};
 	//: sendMessage
 	//  @options #optional
-	ArcClient.prototype.sendMessage = function(call, callback, params){
+	ArcClient.prototype.sendMessage = function(call, callbackF, params){
         if(!this.frameLoaded){            
             console.log("frame not loaded.. Queing " + call);
-            this.queue.push( { call:call, callback:callback, params:params } );
+            this.queue.push( { call:call, callback:callbackF, params:params } );
             return;
         }
         if(this.queue.length > 0){
@@ -47,19 +48,22 @@
             this.sendMessage(msgParams.call, msgParams.callback, msgParams.params);
         }
         console.log("call:"+call+" host:"+this.host);
-		if(callback){ 
+		if(callbackF){ 
 			var id = Math.floor(Math.random()*100000+(new Date().getTime()));
-			window.addEventListener('message', function(e){
-				e.data.id === id && callback.call(this,e);
-			}, false);
+
 		}
-		var data = {'call': call,'id':id};
+		var data = {'call': call,'id':id, callbackId:call + "-" + id };
+
+        this.requests[data.callbackId] = callbackF;
+
 		if(params) data.params = params;        
 		this.iFrame.contentWindow.postMessage(JSON.stringify(data), this.host);
 	};
-    ArcClient.prototype.receiveMessage = function(message){
-        if (event.origin !== this.host)  
-            return;            
+    ArcClient.prototype.receiveMessage = function(event){
+        if (event.origin !== this.host) { return; }
+
+        this.requests[event.data.callbackId]();  
+
     };
 
 	window.ArcClient = ArcClient;