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

PHRAS-3051 #comment Fix : Prod video tools define thumbnail size #time 4h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-05-08 17:01:48 +04:00
parent 01ddf69483
commit 2a55ef6880
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "0.34.195-d", "phraseanet-production-client": "0.34.196-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

8
templates/web/prod/actions/Tools/videoEditor.html.twig
View File

@@ -68,7 +68,13 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<video id="thumb_video" controls="" preload="auto" data-ratio="{{ prevRatio }}"> <video id="thumb_video_A" class="thumb_video fake-video" controls="" preload="auto" data-ratio="{{ prevRatio }}">
{% for subdef in previewHtml5 %}
<source type="{{ subdef.get_mime() }}" src="{{ subdef.get_url() }}"/>
{% endfor %}
{{ 'No preview available' | trans }}
</video>
<video id="thumb_video" class="thumb_video real-video" controls="" preload="auto" data-ratio="{{ prevRatio }}">
{% for subdef in previewHtml5 %} {% for subdef in previewHtml5 %}
<source type="{{ subdef.get_mime() }}" src="{{ subdef.get_url() }}"/> <source type="{{ subdef.get_mime() }}" src="{{ subdef.get_url() }}"/>
{% endfor %} {% endfor %}

8
yarn.lock
View File

@@ -7578,10 +7578,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.195-d: phraseanet-production-client@0.34.196-d:
version "0.34.195-d" version "0.34.196-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.195-d.tgz#27faa60fd2e336fb8ac2e2da17d864b86e469314" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.196-d.tgz#ddd57e762cd10f42e95942fb631259566f85d5e6"
integrity sha512-zFsg21KtO52odU3PJPS+ZNQXoeJHxfRqMOyaid0B128cTOq/GqMCZwhtRPnyrR2TVPkALaU+E5iAUgbpkA0bNg== integrity sha512-qkgEEznndm/c4KQuBLyX4hF2xZLOnpKOf8Sfrd0j1+B7FmVbfXbVxht8jsijjRvISZWfPdEDqOELd3NwSK5drg==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"