GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Less convoluted attachmentlistitem function calls

This commit is contained in:
Mikael Nordfeldth 2016-08-21 09:25:16 +02:00
parent fc06c599bc
commit 4314a286e3
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/attachment.php
View File

@ -35,7 +35,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
*/ */
class Attachment extends AttachmentListItem class Attachment extends AttachmentListItem
{ {
function showLink() { function showNoticeAttachment() {
if (Event::handle('StartShowAttachmentLink', array($this->out, $this->attachment))) { if (Event::handle('StartShowAttachmentLink', array($this->out, $this->attachment))) {
$this->out->elementStart('div', array('id' => 'attachment_view', $this->out->elementStart('div', array('id' => 'attachment_view',
'class' => 'h-entry')); 'class' => 'h-entry'));

18
lib/attachmentlistitem.php
View File

@ -86,28 +86,26 @@ class AttachmentListItem extends Widget
} }
function linkAttr() { function linkAttr() {
return array('class' => 'attachment', return array(
'class' => 'u-url',
'href' => $this->attachment->getAttachmentUrl(), 'href' => $this->attachment->getAttachmentUrl(),
'id' => 'attachment-' . $this->attachment->getID(),
'title' => $this->linkTitle()); 'title' => $this->linkTitle());
} }
function showLink() {
$this->out->elementStart('a', $this->linkAttr());
$this->out->element('span', null, $this->linkTitle());
$this->showRepresentation();
$this->out->elementEnd('a');
}
function showNoticeAttachment() function showNoticeAttachment()
{ {
$this->showLink(); $this->showRepresentation();
} }
function showRepresentation() { function showRepresentation() {
$enclosure = $this->attachment->getEnclosure(); $enclosure = $this->attachment->getEnclosure();
if (Event::handle('StartShowAttachmentRepresentation', array($this->out, $this->attachment))) { if (Event::handle('StartShowAttachmentRepresentation', array($this->out, $this->attachment))) {
$this->out->elementStart('label');
$this->out->element('a', $this->linkAttr(), $this->title());
$this->out->elementEnd('label');
if (!empty($enclosure->mimetype)) { if (!empty($enclosure->mimetype)) {
// First, prepare a thumbnail if it exists. // First, prepare a thumbnail if it exists.
$thumb = null; $thumb = null;

10
lib/inlineattachmentlistitem.php
View File

@ -31,11 +31,6 @@ if (!defined('GNUSOCIAL')) { exit(1); }
class InlineAttachmentListItem extends AttachmentListItem class InlineAttachmentListItem extends AttachmentListItem
{ {
function showLink() {
$this->out->element('a', $this->linkAttr(), $this->title());
$this->showRepresentation();
}
/** /**
* start a single notice. * start a single notice.
* *
@ -45,7 +40,10 @@ class InlineAttachmentListItem extends AttachmentListItem
{ {
// XXX: RDFa // XXX: RDFa
// TODO: add notice_type class e.g., notice_video, notice_image // TODO: add notice_type class e.g., notice_video, notice_image
$this->out->elementStart('li', array('class' => 'inline-attachment')); $this->out->elementStart('li',
array('class' => 'inline-attachment',
'id' => 'attachment-' . $this->attachment->getID(),
));
} }
/** /**