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-3116 : Add some fix on video display

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-06-18 16:45:04 +04:00
parent d7f38accbc
commit b7799e2c82
3 changed files with 8 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.229-d", "phraseanet-production-client": "0.34.231-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",

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

@@ -30,7 +30,7 @@
</a> </a>
</li> </li>
<li> <li>
<a href="#subtitleEditor"> <a href="#subtitleEditor" id="subtitleEditortoggle">
{{ "prod:videoeditor:subtitleTab:: title" | trans }} {{ "prod:videoeditor:subtitleTab:: title" | trans }}
</a> </a>
</li> </li>
@@ -332,6 +332,8 @@
{% for subdef in previewHtml5 %} {% for subdef in previewHtml5 %}
{ {
ratio: '{{ ratio }}', ratio: '{{ ratio }}',
width: '{{ width }}',
height: '{{ height }}',
framerate: {{ record.exif[constant('media_subdef::TC_DATA_FRAMERATE')] | round(2) }}, framerate: {{ record.exif[constant('media_subdef::TC_DATA_FRAMERATE')] | round(2) }},
type: "{{ subdef.get_mime() }}", type: "{{ subdef.get_mime() }}",
src: "{{ subdef.get_url() }}" src: "{{ subdef.get_url() }}"
@@ -346,6 +348,5 @@
preferences: { preferences: {
overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}1{% endif %}, overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}1{% endif %},
} }
}; };
</script> </script>

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.229-d: phraseanet-production-client@0.34.231-d:
version "0.34.229-d" version "0.34.231-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.229-d.tgz#7e118da378b7240b5796370d2c08cb70ee10c7b2" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.231-d.tgz#7633568ce7bf0ac76306cca6c15e577ab4e0584c"
integrity sha512-+uvOQ9x+wICsEwb+uORFJhRcsOVnIWhU29vm5FQjLSFk2rJlsqExZ+X5Md7SJ27ZrpJsLumkgpaYuezKIN5a4A== integrity sha512-AamwJNtpWL5nbxlqXhKCU4UpJIXAeBmY0gK0A5D5RrPqpc7ifH8osTrtMnvo54wXKX9nb6rrAR4vvZ7Z80bSrQ==
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"