clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1544 from annando/1505-oembed-bbcode 

OEmbed: Automatic height, changed behaviour in attachments
This commit is contained in:
Tobias Diekershoff 2015-05-03 09:14:56 +02:00
parent c9e07fa3ac 439aee0a82
commit 23ddc6c77d
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/bbcode.php
View File

@ -4,7 +4,7 @@ require_once('include/event.php');
function bb_attachment($Text, $plaintext = false, $tryoembed = true) { function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
$Text = preg_replace_callback("/(.*?)\[attachment(.*?)\](.*?)\[\/attachment\]/ism", $Text = preg_replace_callback("/(.*?)\[attachment(.*?)\](.*?)\[\/attachment\]/ism",
function ($match) use ($plaintext){ function ($match) use ($plaintext, $tryoembed){
$attributes = $match[2]; $attributes = $match[2];
@ -83,6 +83,9 @@ function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
else else
$oembed = $bookmark[0]; $oembed = $bookmark[0];
if (strstr(strtolower($oembed), "<iframe "))
$text = $oembed;
else {
if (($image != "") AND !strstr(strtolower($oembed), "<img ")) if (($image != "") AND !strstr(strtolower($oembed), "<img "))
$text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $url, $image, $title); $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $url, $image, $title);
elseif (($preview != "") AND !strstr(strtolower($oembed), "<img ")) elseif (($preview != "") AND !strstr(strtolower($oembed), "<img "))
@ -92,6 +95,7 @@ function bb_attachment($Text, $plaintext = false, $tryoembed = true) {
$text .= sprintf('<blockquote>%s</blockquote></span>', trim($match[3])); $text .= sprintf('<blockquote>%s</blockquote></span>', trim($match[3]));
} }
}
return($match[1].$text); return($match[1].$text);
},$Text); },$Text);

9
include/oembed.php
View File

@ -199,10 +199,15 @@ function oembed_format_object($j){
} }
function oembed_iframe($src,$width,$height) { function oembed_iframe($src,$width,$height) {
if(! $width || strstr($width,'%')) if(! $width || strstr($width,'%'))
$width = '640'; $width = '640';
if(! $height || strstr($height,'%')) if(! $height || strstr($height,'%')) {
$height = '300'; $height = '300';
$resize = 'onload="resizeIframe(this);"';
} else
$resize = '';
// try and leave some room for the description line. // try and leave some room for the description line.
$height = intval($height) + 80; $height = intval($height) + 80;
$width = intval($width) + 40; $width = intval($width) + 40;
@ -210,7 +215,7 @@ function oembed_iframe($src,$width,$height) {
$a = get_app(); $a = get_app();
$s = $a->get_baseurl()."/oembed/".base64url_encode($src); $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) { function openClose(theID) {
if(document.getElementById(theID).style.display == "block") { if(document.getElementById(theID).style.display == "block") {