tonyair
/
silverstripe-iframe
mirror of https://github.com/silverstripe/silverstripe-iframe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #46 from mateusz/fix-jquery 

Update for jQuery 3.
This commit is contained in:
Robbie Averill 2019-08-09 11:26:20 +12:00 committed by GitHub
parent 785f51c30f a4709f5b91
commit 2705bc1fda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
javascript/iframe_page.js
View File

@ -9,26 +9,27 @@ if (typeof jQuery!=='undefined') {
iframe.hide(); iframe.hide();
loading.show(); loading.show();
$(function() { $( iframe ).on('load', function() {
$( window ).load(function() { // Iframe content has been loaded
// Iframe content has been loaded loading.hide();
loading.hide(); iframe.show();
iframe.show();
if (iframe.hasClass('iframepage-height-auto')===true) { if (iframe.hasClass('iframepage-height-auto')===true) {
// Try to set the height to the height of the iframe content (only possible if it is the same domain) // Try to set the height to the height of the iframe content (only possible if it is the same domain)
try { try {
var iframeInsideSize = $(iframe[0].contentWindow.document.body).height(); // Use plain JS to get iframe size. There is some timing issue with jQuery
iframe.css('height', (parseInt(iframeInsideSize)+100)+'px'); // which causes the iframe size to be 0 even after iframe.show().
} const domframe = document.querySelector('#Iframepage-iframe');
catch(e) { var iframeInsideSize = domframe.contentWindow.document.body.offsetHeight;
// Failed to set the height, we fall back to default css height. iframe.css('height', (parseInt(iframeInsideSize)+100)+'px');
}
} }
catch(e) {
// Failed to set the height, we fall back to default css height.
}
}
// Finally, remove the marker // Finally, remove the marker
iframe.removeClass('iframepage-not-ready'); iframe.removeClass('iframepage-not-ready');
});
}); });
})(jQuery); })(jQuery);
} }