#129 convert sendMessage data to JSON, to allow more datatypes to be …

…transmitted to host page
davidjbradshaw · Dec 7, 2014 · fdab21e · fdab21e
1 parent 6147cd8
commit fdab21e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/src/iframeResizer.contentWindow.js b/src/iframeResizer.contentWindow.js
@@ -193,7 +193,7 @@
 					sendMsg(y,x,'scrollToOffset'); // X&Y reversed at sendMsg uses hieght/width
 				},
 				sendMessage: function sendMessageF(msg,targetOrigin){
-					sendMsg(0,0,'message',msg,targetOrigin);
+					sendMsg(0,0,'message',JSON.stringify(msg),targetOrigin);
 				},
 				setHeightCalculationMethod: function setHeightCalculationMethodF(heightCalculationMethod){
 					heightCalcMode = heightCalculationMethod;

diff --git a/src/iframeResizer.js b/src/iframeResizer.js
@@ -181,7 +181,7 @@
 			log(' MessageCallback passed: {iframe: '+ messageData.iframe.id + ', message: ' + msgBody + '}');
 			settings.messageCallback({
 				iframe: messageData.iframe,
-				message: msgBody
+				message: JSON.parse(msgBody)
 			});
 			log(' --');
 		}

diff --git a/test/resources/frame.content.html b/test/resources/frame.content.html
@@ -145,7 +145,10 @@
 									callMethod('sendMessage',document.body.style.background);
 									break;
 								case 'chkSendMsg':
-									callMethod('sendMessage','message: test');
+									callMethod('sendMessage','message: test string');
+									break;
+								case 'chkSendObj':
+									callMethod('sendMessage',{message: 'test object'});
 									break;
 								case 'chkGetId':
 									if ('parentIFrame' in window)

diff --git a/test/sendMessage.html b/test/sendMessage.html
@@ -25,7 +25,7 @@
         count = 0,
         msgId = '[iFrameSizerTest]:';
 
-		asyncTest( "sendMessage", function() {
+    asyncTest( "sendMessage (string)", function() {
 
       iFrameResize({
         log:true,
@@ -35,14 +35,24 @@
           sendMessage('chkSendMsg');
         },
         messageCallback:function(messageData){
-          ok( 'message: test' === messageData.message, 'Receive message back from iFrame via sendMessage function.' );
-          if (2===count){
-            sendMessage('chkSendMsg');
-            count++;
-          } else {
-            start();
-          }
-
+          ok( 'message: test string' === messageData.message, 'Receive string message back from iFrame via sendMessage function.' );
+          start();
+        }
+      });
+    });
+
+    asyncTest( "sendMessage (object)", function() {
+
+      iFrameResize({
+        log:true,
+        enablePublicMethods:true,
+        resizedCallback:function(messageData){
+          ok( true, 'Receive init message back from iFrame.' );
+          sendMessage('chkSendObj');
+        },
+        messageCallback:function(messageData){
+          ok( 'test object' === messageData.message.message, 'Receive object message back from iFrame via sendMessage function.' );
+          start();
         }
       });
     });