diff options
| author | Xéfir Destiny <xefir@crystalyx.net> | 2014-06-16 17:12:05 +0200 |
|---|---|---|
| committer | Xéfir Destiny <xefir@crystalyx.net> | 2014-06-16 17:12:05 +0200 |
| commit | e1a7814e0f2c00b6f939f85217a7c5d5e578e129 (patch) | |
| tree | ed7de95028eebeb87b8d94255c656d95146994c6 | |
| parent | f9f0598ebb16fb39f4162d86a04ac3fb3752ee6e (diff) | |
Fix audio tag and basic video enclosure support
| -rw-r--r-- | fetcher/feedfetcher.php | 8 | ||||
| -rw-r--r-- | templates/part.items.php | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/fetcher/feedfetcher.php b/fetcher/feedfetcher.php index 9c2049395..643f37282 100644 --- a/fetcher/feedfetcher.php +++ b/fetcher/feedfetcher.php @@ -160,14 +160,10 @@ class FeedFetcher implements IFeedFetcher { } } - // TODO: make it work for video files also $enclosure = $simplePieItem->get_enclosure(); if($enclosure !== null) { - $enclosureType = $enclosure->get_type(); - if(stripos($enclosureType, "audio/") !== false) { - $item->setEnclosureMime($enclosureType); - $item->setEnclosureLink($enclosure->get_link()); - } + $item->setEnclosureMime($enclosure->get_type()); + $item->setEnclosureLink($enclosure->get_link()); } return $item; diff --git a/templates/part.items.php b/templates/part.items.php index 8b062b787..9e5c2a917 100644 --- a/templates/part.items.php +++ b/templates/part.items.php @@ -64,9 +64,15 @@ </h2> <div class="enclosure" ui-if="item.enclosureLink"> - <news-audio type="{{ item.enclosureType }}" ng-src="{{ item.enclosureLink|trustUrl }}"/><?php + <audio ui-if="item.enclosureMime.indexOf('audio/') == 0" type="{{ item.enclosureMime }}" ng-src="{{ item.enclosureLink|trustUrl }}" controls><?php p($l->t('Download')) ?></audio> + <video ui-if="item.enclosureMime.indexOf('video/') == 0" type="{{ item.enclosureMime }}" ng-src="{{ item.enclosureLink|trustUrl }}" controls><?php + p($l->t('Download')) + ?></video> + <a ui-if="item.enclosureMime.indexOf('audio/') != 0 && item.enclosureMime.indexOf('video/') != 0" type="{{ item.enclosureMime }}" ng-href="{{ item.enclosureLink|trustUrl }}"><?php + p($l->t('Download')) + ?></a> </div> <div class="item_body" news-bind-html-unsafe="item.body"> |