Skip to content

Commit

Permalink
Updated for v3
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjbradshaw committed Aug 28, 2015
1 parent a83e77e commit c10ac6e
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 23 deletions.
1 change: 0 additions & 1 deletion test/_init.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
var msgId = '[iFrameSizerTest]:';

asyncTest( "postMessage Response", function() {

iFrameResize({
log:true,
bodyBackground:'wheat',
Expand Down
14 changes: 7 additions & 7 deletions test/_init_once.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@
<script src="../src/iframeResizer.js"></script>
<script src="../js/ie8.polyfils.min.js"></script>
<script>

'use strict';
var recievedIframeIds = [];
var receivedIframeIds = [];
asyncTest( "postMessage Response", function() {
iFrameResize({
log:true,
bodyBackground:'wheat',
heightCalculationMethod:'max',
initCallback:function(iframe){
ok( true, 'Receive init message back from iFrame.' );
recievedIframeIds.push(iframe.id);
if (recievedIframeIds.length === 2) {
ok( recievedIframeIds.indexOf('iFrameResizer0') > -1, 'iFrame id = iFrameResizer0 is present.' )
ok( recievedIframeIds.indexOf('iFrameResizer1') > -1, 'iFrame id = iFrameResizer1 is present.' )
receivedIframeIds.push(iframe.id);
if (receivedIframeIds.length === 2) {
ok( receivedIframeIds.indexOf('iFrameResizer0') > -1, 'iFrame id = iFrameResizer0 is present.' )
ok( receivedIframeIds.indexOf('iFrameResizer1') > -1, 'iFrame id = iFrameResizer1 is present.' )
} else {
start();
}
}
});
});

</script>
</body>
</html>
4 changes: 2 additions & 2 deletions test/_init_once_async.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<script src="../js/ie8.polyfils.min.js"></script>
<script src="../src/iframeResizer.js"></script>
<script>

'use strict';
var $iframeFirst = $('iframe');
var recievedIframeIds = [];
Expand Down Expand Up @@ -66,7 +66,7 @@
}
});
});

</script>
</body>
</html>
1 change: 0 additions & 1 deletion test/background.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
iFrameResize({
log:true,
bodyBackground:background,
enablePublicMethods:true,
resizedCallback:function(messageData){
ok( true, 'Receive init message back from iFrame.' );
sendMessage('chkBackground');
Expand Down
1 change: 0 additions & 1 deletion test/getId.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

iFrameResize({
log:true,
enablePublicMethods:true,
resizedCallback:function(messageData){
ok( true, 'Receive init message back from iFrame.' );
sendMessage('chkGetId');
Expand Down
5 changes: 2 additions & 3 deletions test/margin.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,21 @@

for (var i=0; i !== margins.length; i++){
asyncTest( "Margin " + margins[i], function() {
var
var
height = 0,
i = counter(), //counteract async
margin = margins[i];

iFrameResize({
log:true,
enablePublicMethods:true,
bodyMargin:margin,
resizedCallback:function(messageData){
ok( true, 'Receive message back from iFrame.' );
height=parseInt(messageData.height,10);
sendMessage('chkHeight');
},
messageCallback:function(messageData){
var
var
marginCheck = 2 *parseInt(margin,10),
bodyHeight = parseInt(messageData.message,10);

Expand Down
3 changes: 1 addition & 2 deletions test/nested.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div id="qunit-fixture">

<div style="width:600px;">
<iframe id="parent" src="resources/frame.content.html" width="100%" scrolling="no"></iframe>
<iframe id="parentPage" src="resources/frame.content.html" width="100%" scrolling="no"></iframe>
</div>

</div>
Expand All @@ -30,7 +30,6 @@

$('iframe').iFrameResize({
log:true,
enablePublicMethods:true,
resizedCallback:function(messageData){
ok( true, 'Receive init message back from iFrame.' );
sendMessage('nested');
Expand Down
2 changes: 0 additions & 2 deletions test/sendMessage.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

iFrameResize({
log:true,
enablePublicMethods:true,
resizedCallback:function(messageData){
ok( true, 'Receive init message back from iFrame.' );
sendMessage('chkSendMsg');
Expand All @@ -46,7 +45,6 @@

iFrameResize({
log:true,
enablePublicMethods:true,
resizedCallback:function(messageData){
ok( true, 'Receive init message back from iFrame.' );
sendMessage('chkSendObj');
Expand Down
7 changes: 3 additions & 4 deletions test/v1.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
enablePublicMethods:false,
callback:function(){}
};


function setupRAF(){
var
Expand Down Expand Up @@ -146,12 +145,12 @@
}

function postMessageToIframe(){
var msg = iframe.id + ':' + settings.contentWindowBodyMargin + ':' + settings.doWidth + ':' +
var msg = iframe.id + ':' + settings.contentWindowBodyMargin + ':' + settings.doWidth + ':' +
settings.log + ':' + settings.interval + ':' + settings.enablePublicMethods;
log('[' + calleeMsg + '] Sending init msg to iframe ('+msg+')');
iframe.contentWindow.postMessage( msgId + msg, '*' );
}

ensureHasId();
postMessageToIframe();
}
Expand Down Expand Up @@ -184,7 +183,7 @@
}
});
});

</script>
</body>
</html>

0 comments on commit c10ac6e

Please sign in to comment.