tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Automatically resize iframe if no height was provided.

Browse source
This commit is contained in:
Michael Vogel 2015-05-01 14:29:53 +02:00
parent 747607fe97
commit 439aee0a82
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/oembed.php
View file

@ -199,10 +199,15 @@ function oembed_format_object($j){
}
function oembed_iframe($src,$width,$height) {
if(! $width || strstr($width,'%'))
$width = '640';
if(! $height || strstr($height,'%'))
if(! $height || strstr($height,'%')) {
$height = '300';
$resize = 'onload="resizeIframe(this);"';
} else
$resize = '';
// try and leave some room for the description line.
$height = intval($height) + 80;
$width = intval($width) + 40;
@ -210,7 +215,7 @@ function oembed_iframe($src,$width,$height) {
$a = get_app();
$s = $a->get_baseurl()."/oembed/".base64url_encode($src);
return '<iframe class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
return '<iframe '.$resize.' class="embed_rich" height="'.$height.'" width="'.$width.'" src="'.$s.'" frameborder="no">'.t('Embedded content').'</iframe>';
}

4
js/main.js
View file

@ -1,3 +1,7 @@
function resizeIframe(obj) {
obj.style.height = 0;
obj.style.height = obj.contentWindow.document.body.scrollHeight + 'px';
}
function openClose(theID) {
if(document.getElementById(theID).style.display == "block") {