wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TinyMCE: fixes to attachment handling

Browse Source
This commit is contained in:
Brion Vibber 2010-08-12 11:39:42 -07:00
parent 3370a326d8
commit f14f252a16
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plugins/TinyMCE/TinyMCEPlugin.php
View File

@ -148,8 +148,7 @@ class TinyMCEPlugin extends Plugin
$this->formatAttachment($img, $media); $this->formatAttachment($img, $media);
} }
} }
$html = $dom->saveHTML(); $options['rendered'] = $this->saveHtml($dom);
$options['rendered'] = $html;
} }
// The regular code will append the short URL to the plaintext content. // The regular code will append the short URL to the plaintext content.
@ -166,29 +165,26 @@ class TinyMCEPlugin extends Plugin
*/ */
private function formatAttachment($img, $media) private function formatAttachment($img, $media)
{ {
$parent = $img->parentNode;
$dom = $img->ownerDocument; $dom = $img->ownerDocument;
$link = $dom->createElement('a'); $link = $dom->createElement('a');
$link->setAttribute('href', $media->fileurl); $link->setAttribute('href', $media->fileurl);
$link->setAttribute('title', File::url($media->filename));
if ($this->isEmbeddable($media)) { if ($this->isEmbeddable($media)) {
common_log(LOG_INFO, 'QQQQQ');
// Fix the the <img> attributes and wrap the link around it... // Fix the the <img> attributes and wrap the link around it...
$this->insertImage($img, $media); $this->insertImage($img, $media);
common_log(LOG_INFO, 'QQQQQ A!'); $parent->replaceChild($link, $img); //it dies in here?!
try {
$dom->replaceChild($link, $img); //it dies in here?!
} catch (Exception $wtf) {
common_log(LOG_ERR, 'QQQ WTF? ' . $wtf->getMessage());
}
common_log(LOG_INFO, 'QQQQQ B!');
$link->appendChild($img); $link->appendChild($img);
common_log(LOG_INFO, 'QQQQQ C!');
} else { } else {
common_log(LOG_INFO, 'QQQQQ X');
// Not an image? Replace it with a text link. // Not an image? Replace it with a text link.
$link->setAttribute('rel', 'external');
$link->setAttribute('class', 'attachment');
$link->setAttribute('id', 'attachment-' . $media->fileRecord->id);
$text = $dom->createTextNode($media->shortUrl()); $text = $dom->createTextNode($media->shortUrl());
$link->appendChild($text); $link->appendChild($text);
$dom->replaceChild($link, $img); $parent->replaceChild($link, $img);
} }
} }
@ -265,6 +261,15 @@ class TinyMCEPlugin extends Plugin
} }
} }
private function saveHtml($dom)
{
$html = $dom->saveHTML();
// hack to remove surrounding crap added to the dom
// all we wanted was a fragment
$stripped = preg_replace('/^.*<body[^>]*>(.*)<\/body.*$/is', '$1', $html);
return $stripped;
}
function _inlineScript() function _inlineScript()
{ {
$path = common_path('plugins/TinyMCE/js/tiny_mce.js'); $path = common_path('plugins/TinyMCE/js/tiny_mce.js');