Merge branch 'PHRAS-3935-phraseanet_local_id-patch' of https://github…

….com/alchemy-fr/Phraseanet into PHRAS-3935-phraseanet_local_id-patch
alchemy-fr · Oct 19, 2023 · fd51f46 · fd51f46
2 parents 48c3d43 + ebb82d8
commit fd51f46
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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('<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());

diff --git 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('<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());

diff --git 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
@@ -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
@@ -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
@@ -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(
             `<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());

diff --git 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
         ];
 
     }