Skip to content

Commit

Permalink
fix videotools (#4394)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aynsix
aynsix authored Oct 18, 2023
1 parent 16353c3 commit fc3baaf
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Phraseanet-production-client/config/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ module.exports = {
setupDir: _root + 'tests/setup/node.js',
karmaConf: _root + 'config/karma.conf.js',
// change this version when you change JS file for lazy loading
assetFileVersion: 94
assetFileVersion: 95
};
2 changes: 1 addition & 1 deletion Phraseanet-production-client/dist/authenticate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=94";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=95";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {
Expand Down
2 changes: 1 addition & 1 deletion Phraseanet-production-client/dist/authenticate.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=94";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=95";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {
Expand Down
2 changes: 1 addition & 1 deletion Phraseanet-production-client/dist/commons.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=94";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=95";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {
Expand Down
2 changes: 1 addition & 1 deletion Phraseanet-production-client/dist/commons.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=94";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=95";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {
Expand Down
3 changes: 1 addition & 2 deletions Phraseanet-production-client/dist/lazy-1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64036,7 +64036,6 @@ var rangeCapture = function rangeCapture(services, datas) {
}
options.frameRates = {};
options.ratios = {};
var coverUrl = '';
var generateSourcesTpl = function generateSourcesTpl(record) {
var recordSources = [];
_underscore2.default.each(record.sources, function (s, i) {
Expand All @@ -64049,7 +64048,7 @@ var rangeCapture = function rangeCapture(services, datas) {
};

var sources = generateSourcesTpl(record);
$container.append('<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls\n preload="none" width="100%" height="100%" poster="' + coverUrl + '" data-setup=\'{"language":"' + localeService.getLocale() + '"}\'>' + sources + ' </video>');
$container.append('<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls\n preload="none" width="100%" height="100%" data-setup=\'{"language":"' + localeService.getLocale() + '"}\'>' + sources + ' </video>');

// window.videojs = videojs;
_video2.default.addLanguage(localeService.getLocale(), localeService.getTranslations());
Expand Down
3 changes: 1 addition & 2 deletions Phraseanet-production-client/dist/lazy-1.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64036,7 +64036,6 @@ var rangeCapture = function rangeCapture(services, datas) {
}
options.frameRates = {};
options.ratios = {};
var coverUrl = '';
var generateSourcesTpl = function generateSourcesTpl(record) {
var recordSources = [];
_underscore2.default.each(record.sources, function (s, i) {
Expand All @@ -64049,7 +64048,7 @@ var rangeCapture = function rangeCapture(services, datas) {
};

var sources = generateSourcesTpl(record);
$container.append('<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls\n preload="none" width="100%" height="100%" poster="' + coverUrl + '" data-setup=\'{"language":"' + localeService.getLocale() + '"}\'>' + sources + ' </video>');
$container.append('<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls\n preload="none" width="100%" height="100%" data-setup=\'{"language":"' + localeService.getLocale() + '"}\'>' + sources + ' </video>');

// window.videojs = videojs;
_video2.default.addLanguage(localeService.getLocale(), localeService.getTranslations());
Expand Down
1 change: 0 additions & 1 deletion Phraseanet-production-client/dist/production.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63629,7 +63629,6 @@ var recordVideoEditorModal = function recordVideoEditorModal(services, datas) {
openModal(datas, activeTab);
});
};
initialize();

toolsStream.subscribe(function (params) {
switch (params.action) {
Expand Down
1 change: 0 additions & 1 deletion Phraseanet-production-client/dist/production.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63629,7 +63629,6 @@ var recordVideoEditorModal = function recordVideoEditorModal(services, datas) {
openModal(datas, activeTab);
});
};
initialize();

toolsStream.subscribe(function (params) {
switch (params.action) {
Expand Down
1 change: 0 additions & 1 deletion Phraseanet-production-client/src/components/record/videoEditor/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ const recordVideoEditorModal = (services, datas, activeTab = false) => {
openModal(datas, activeTab);
});
};
initialize();

toolsStream.subscribe((params) => {
switch (params.action) {
Expand Down
3 changes: 1 addition & 2 deletions Phraseanet-production-client/src/components/videoEditor/rangeCapture.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const rangeCapture = (services, datas, activeTab = false) => {
}
options.frameRates = {};
options.ratios = {};
const coverUrl = '';
let generateSourcesTpl = (record) => {
let recordSources = [];
_.each(record.sources, (s, i) => {
Expand All @@ -50,7 +49,7 @@ const rangeCapture = (services, datas, activeTab = false) => {
let sources = generateSourcesTpl(record);
$container.append(
`<video id="embed-video" class="embed-resource video-js vjs-default-skin vjs-big-play-centered" controls
preload="none" width="100%" height="100%" poster="${coverUrl}" data-setup='{"language":"${localeService.getLocale()}"}'>${sources} </video>`);
preload="none" width="100%" height="100%" data-setup='{"language":"${localeService.getLocale()}"}'>${sources} </video>`);

// window.videojs = videojs;
videojs.addLanguage(localeService.getLocale(), localeService.getTranslations());
Expand Down
2 changes: 1 addition & 1 deletion lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function getGlobals()
{
return [
// change this version when you change JS file to force the navigation to reload js file
'assetFileVersion' => 94
'assetFileVersion' => 95
];

}
Expand Down

0 comments on commit fc3baaf

Please sign in to comment.