From fc3baaf36815c17b071761d7ddf261f857046397 Mon Sep 17 00:00:00 2001 From: Aina Sitraka <35221835+aynsix@users.noreply.github.com> Date: Thu, 19 Oct 2023 00:55:41 +0300 Subject: [PATCH] fix videotools (#4394) --- Phraseanet-production-client/config/config.js | 2 +- Phraseanet-production-client/dist/authenticate.js | 2 +- Phraseanet-production-client/dist/authenticate.min.js | 2 +- Phraseanet-production-client/dist/commons.js | 2 +- Phraseanet-production-client/dist/commons.min.js | 2 +- Phraseanet-production-client/dist/lazy-1.js | 3 +-- Phraseanet-production-client/dist/lazy-1.min.js | 3 +-- Phraseanet-production-client/dist/production.js | 1 - Phraseanet-production-client/dist/production.min.js | 1 - .../src/components/record/videoEditor/index.js | 1 - .../src/components/videoEditor/rangeCapture.js | 3 +-- lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php | 2 +- 12 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Phraseanet-production-client/config/config.js b/Phraseanet-production-client/config/config.js index 9b644e52a2..a80d4c2d74 100644 --- a/Phraseanet-production-client/config/config.js +++ b/Phraseanet-production-client/config/config.js @@ -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 }; diff --git a/Phraseanet-production-client/dist/authenticate.js b/Phraseanet-production-client/dist/authenticate.js index 5c0f8060eb..c481923e4c 100644 --- a/Phraseanet-production-client/dist/authenticate.js +++ b/Phraseanet-production-client/dist/authenticate.js @@ -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() { diff --git a/Phraseanet-production-client/dist/authenticate.min.js b/Phraseanet-production-client/dist/authenticate.min.js index 4c593b6b76..8e97739776 100644 --- a/Phraseanet-production-client/dist/authenticate.min.js +++ b/Phraseanet-production-client/dist/authenticate.min.js @@ -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() { diff --git a/Phraseanet-production-client/dist/commons.js b/Phraseanet-production-client/dist/commons.js index 8121543b5d..fcaf2f0225 100644 --- a/Phraseanet-production-client/dist/commons.js +++ b/Phraseanet-production-client/dist/commons.js @@ -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() { diff --git a/Phraseanet-production-client/dist/commons.min.js b/Phraseanet-production-client/dist/commons.min.js index e8a59b42b4..ab39527929 100644 --- a/Phraseanet-production-client/dist/commons.min.js +++ b/Phraseanet-production-client/dist/commons.min.js @@ -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() { diff --git a/Phraseanet-production-client/dist/lazy-1.js b/Phraseanet-production-client/dist/lazy-1.js index dc81be459f..743fc76122 100644 --- a/Phraseanet-production-client/dist/lazy-1.js +++ b/Phraseanet-production-client/dist/lazy-1.js @@ -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) { @@ -64049,7 +64048,7 @@ var rangeCapture = function rangeCapture(services, datas) { }; var sources = generateSourcesTpl(record); - $container.append(''); + $container.append(''); // window.videojs = videojs; _video2.default.addLanguage(localeService.getLocale(), localeService.getTranslations()); diff --git a/Phraseanet-production-client/dist/lazy-1.min.js b/Phraseanet-production-client/dist/lazy-1.min.js index dc81be459f..743fc76122 100644 --- a/Phraseanet-production-client/dist/lazy-1.min.js +++ b/Phraseanet-production-client/dist/lazy-1.min.js @@ -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) { @@ -64049,7 +64048,7 @@ var rangeCapture = function rangeCapture(services, datas) { }; var sources = generateSourcesTpl(record); - $container.append(''); + $container.append(''); // window.videojs = videojs; _video2.default.addLanguage(localeService.getLocale(), localeService.getTranslations()); diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js index d068c73eda..1f4247784a 100644 --- a/Phraseanet-production-client/dist/production.js +++ b/Phraseanet-production-client/dist/production.js @@ -63629,7 +63629,6 @@ var recordVideoEditorModal = function recordVideoEditorModal(services, datas) { openModal(datas, activeTab); }); }; - initialize(); toolsStream.subscribe(function (params) { switch (params.action) { diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js index d068c73eda..1f4247784a 100644 --- a/Phraseanet-production-client/dist/production.min.js +++ b/Phraseanet-production-client/dist/production.min.js @@ -63629,7 +63629,6 @@ var recordVideoEditorModal = function recordVideoEditorModal(services, datas) { openModal(datas, activeTab); }); }; - initialize(); toolsStream.subscribe(function (params) { switch (params.action) { diff --git a/Phraseanet-production-client/src/components/record/videoEditor/index.js b/Phraseanet-production-client/src/components/record/videoEditor/index.js index 4f43d40951..1ea0d272e3 100644 --- a/Phraseanet-production-client/src/components/record/videoEditor/index.js +++ b/Phraseanet-production-client/src/components/record/videoEditor/index.js @@ -26,7 +26,6 @@ const recordVideoEditorModal = (services, datas, activeTab = false) => { openModal(datas, activeTab); }); }; - initialize(); toolsStream.subscribe((params) => { switch (params.action) { diff --git a/Phraseanet-production-client/src/components/videoEditor/rangeCapture.js b/Phraseanet-production-client/src/components/videoEditor/rangeCapture.js index 475ca15141..1999017204 100644 --- a/Phraseanet-production-client/src/components/videoEditor/rangeCapture.js +++ b/Phraseanet-production-client/src/components/videoEditor/rangeCapture.js @@ -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) => { @@ -50,7 +49,7 @@ const rangeCapture = (services, datas, activeTab = false) => { let sources = generateSourcesTpl(record); $container.append( ``); + preload="none" width="100%" height="100%" data-setup='{"language":"${localeService.getLocale()}"}'>${sources} `); // window.videojs = videojs; videojs.addLanguage(localeService.getLocale(), localeService.getTranslations()); diff --git a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php index ff80e50df9..ffca44fd5d 100644 --- a/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php +++ b/lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php @@ -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 ]; }