hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2888 from aynsix/PHRAS-2375-port41-preview-pdf-on-pdfjs

Browse Source 
PHRAS-2375 Port To 4.1 - PHRAS-2359 - PDF and office Document as PDF preview
This commit is contained in:
Nicolas Maillat
2019-02-15 20:15:32 +01:00
committed by GitHub
parent 53f0ab60e7 902e2372a8
commit 41d0b373bd
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
composer.lock generated
View File

@@ -131,16 +131,16 @@
}, },
{ {
"name": "alchemy/embed-bundle", "name": "alchemy/embed-bundle",
"version": "0.3.7", "version": "0.3.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/embed-bundle.git", "url": "https://github.com/alchemy-fr/embed-bundle.git",
"reference": "ce7408c7a47387eed3df2a743577d6e0e25f991f" "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/ce7408c7a47387eed3df2a743577d6e0e25f991f", "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/8a9699bc51e2b2997ccfd357bb2892f3702c33ef",
"reference": "ce7408c7a47387eed3df2a743577d6e0e25f991f", "reference": "8a9699bc51e2b2997ccfd357bb2892f3702c33ef",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
@@ -178,10 +178,10 @@
], ],
"description": "Embed resources bundle", "description": "Embed resources bundle",
"support": { "support": {
"source": "https://github.com/alchemy-fr/embed-bundle/tree/0.3.7", "source": "https://github.com/alchemy-fr/embed-bundle/tree/0.3.8",
"issues": "https://github.com/alchemy-fr/embed-bundle/issues" "issues": "https://github.com/alchemy-fr/embed-bundle/issues"
}, },
"time": "2017-05-30T13:18:21+00:00" "time": "2019-01-11T10:35:41+00:00"
}, },
{ {
"name": "alchemy/geonames-api-consumer", "name": "alchemy/geonames-api-consumer",

2
lib/classes/media/subdef.php
View File

@@ -89,6 +89,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
const TYPE_AUDIO_MP3 = 'AUDIO_MP3'; const TYPE_AUDIO_MP3 = 'AUDIO_MP3';
const TYPE_IMAGE = 'IMAGE'; const TYPE_IMAGE = 'IMAGE';
const TYPE_NO_PLAYER = 'UNKNOWN'; const TYPE_NO_PLAYER = 'UNKNOWN';
const TYPE_PDF = 'PDF';
/* /*
* Technical datas types constants * Technical datas types constants
@@ -407,6 +408,7 @@ class media_subdef extends media_abstract implements cache_cacheableInterface
{ {
static $types = [ static $types = [
'application/x-shockwave-flash' => self::TYPE_FLEXPAPER, 'application/x-shockwave-flash' => self::TYPE_FLEXPAPER,
'application/pdf' => self::TYPE_PDF,
'audio/mp3' => self::TYPE_AUDIO_MP3, 'audio/mp3' => self::TYPE_AUDIO_MP3,
'audio/mpeg' => self::TYPE_AUDIO_MP3, 'audio/mpeg' => self::TYPE_AUDIO_MP3,
'image/gif' => self::TYPE_IMAGE, 'image/gif' => self::TYPE_IMAGE,

2
templates/web/common/thumbnail.html.twig
View File

@@ -19,7 +19,7 @@
src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}" src="{{ url('alchemy_embed_view', {url: url|trim, autoplay: autoplay|default('false') }) }}"
frameborder="0" allowfullscreen></iframe> frameborder="0" allowfullscreen></iframe>
</div> </div>
{% elseif record_type == 'FLEXPAPER' %} {% elseif record_type == 'FLEXPAPER' or record_type == 'PDF' %}
<div id="phraseanet-embed-frame" class="documentTips" <div id="phraseanet-embed-frame" class="documentTips"
data-original-width="{{original_w}}" data-original-width="{{original_w}}"
data-original-height="{{original_h}}" data-original-height="{{original_h}}"