Patch 3.2.0: set duration on progress bar init

samvera-labs · Aug 9, 2024 · 6d19448 · 6d19448
1 parent 96eec9f
commit 6d19448
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 55 deletions.
diff --git a/dist/ramp.cjs.js b/dist/ramp.cjs.js
@@ -4724,8 +4724,8 @@ var VideoJSProgress = /*#__PURE__*/function (_vjsComponent) {
         srcIndex = _this$options.srcIndex;
       var _targets$srcIndex = targets[srcIndex],
         start = _targets$srcIndex.start,
-        end = _targets$srcIndex.end;
-      var duration = this.player.canvasDuration;
+        end = _targets$srcIndex.end,
+        duration = _targets$srcIndex.duration;
       var startTime = start,
         endTime = end;
       var isMultiSourced = targets.length > 1 ? true : false;
@@ -6480,7 +6480,6 @@ function VideoJSPlayer(_ref) {
     player.src(options.sources);
     player.poster(options.poster);
     player.canvasIndex = cIndexRef.current;
-    player.canvasDuration = canvasDurationRef.current;
     player.srcIndex = srcIndex;
     player.targets = targets;
     player.canvasIsEmpty = canvasIsEmptyRef.current;
@@ -6603,11 +6602,6 @@ function VideoJSPlayer(_ref) {
     player.one('loadedmetadata', function () {
       console.log('Player loadedmetadata');
       player.duration(canvasDurationRef.current);
-      /**
-       * Set property canvasDuration in the player to use in videoJSProgress component.
-       * This updates the property when player.src() is updates.
-       */
-      player.canvasDuration = canvasDurationRef.current;
 
       // Reveal player once metadata is loaded
       player.removeClass('vjs-disabled');
@@ -6681,15 +6675,6 @@ function VideoJSPlayer(_ref) {
       player.volume(startVolume);
       player.srcIndex = srcIndex;
       player.duration(canvasDurationRef.current);
-
-      /**
-       * Set property canvasDuration in the player to use in videoJSProgress component.
-       * Video.js' in-built duration function doesn't seem to update as fast as
-       * we expect to be used in videoJSProgress component.
-       * Setting this in the ready callback makes sure this is updated to the
-       * correct value before 'loadstart' event is fired in videoJSProgress component.
-       */
-      player.canvasDuration = canvasDurationRef.current;
       if (enableTitleLink) {
         player.canvasLink = canvasLinkRef.current;
       }
@@ -7553,6 +7538,7 @@ var MediaPlayer = function MediaPlayer(_ref) {
           };
         }
         timeFragment.altStart = timeFragment.start;
+        timeFragment.duration = duration;
         manifestDispatch({
           canvasTargets: [timeFragment],
           type: 'canvasTargets'

diff --git a/dist/ramp.cjs.min.js b/dist/ramp.cjs.min.js
diff --git a/dist/ramp.esm.js b/dist/ramp.esm.js
@@ -4692,8 +4692,8 @@ var VideoJSProgress = /*#__PURE__*/function (_vjsComponent) {
         srcIndex = _this$options.srcIndex;
       var _targets$srcIndex = targets[srcIndex],
         start = _targets$srcIndex.start,
-        end = _targets$srcIndex.end;
-      var duration = this.player.canvasDuration;
+        end = _targets$srcIndex.end,
+        duration = _targets$srcIndex.duration;
       var startTime = start,
         endTime = end;
       var isMultiSourced = targets.length > 1 ? true : false;
@@ -6448,7 +6448,6 @@ function VideoJSPlayer(_ref) {
     player.src(options.sources);
     player.poster(options.poster);
     player.canvasIndex = cIndexRef.current;
-    player.canvasDuration = canvasDurationRef.current;
     player.srcIndex = srcIndex;
     player.targets = targets;
     player.canvasIsEmpty = canvasIsEmptyRef.current;
@@ -6571,11 +6570,6 @@ function VideoJSPlayer(_ref) {
     player.one('loadedmetadata', function () {
       console.log('Player loadedmetadata');
       player.duration(canvasDurationRef.current);
-      /**
-       * Set property canvasDuration in the player to use in videoJSProgress component.
-       * This updates the property when player.src() is updates.
-       */
-      player.canvasDuration = canvasDurationRef.current;
 
       // Reveal player once metadata is loaded
       player.removeClass('vjs-disabled');
@@ -6649,15 +6643,6 @@ function VideoJSPlayer(_ref) {
       player.volume(startVolume);
       player.srcIndex = srcIndex;
       player.duration(canvasDurationRef.current);
-
-      /**
-       * Set property canvasDuration in the player to use in videoJSProgress component.
-       * Video.js' in-built duration function doesn't seem to update as fast as
-       * we expect to be used in videoJSProgress component.
-       * Setting this in the ready callback makes sure this is updated to the
-       * correct value before 'loadstart' event is fired in videoJSProgress component.
-       */
-      player.canvasDuration = canvasDurationRef.current;
       if (enableTitleLink) {
         player.canvasLink = canvasLinkRef.current;
       }
@@ -7521,6 +7506,7 @@ var MediaPlayer = function MediaPlayer(_ref) {
           };
         }
         timeFragment.altStart = timeFragment.start;
+        timeFragment.duration = duration;
         manifestDispatch({
           canvasTargets: [timeFragment],
           type: 'canvasTargets'

diff --git a/dist/ramp.umd.js b/dist/ramp.umd.js
@@ -4698,8 +4698,8 @@
 	        srcIndex = _this$options.srcIndex;
 	      var _targets$srcIndex = targets[srcIndex],
 	        start = _targets$srcIndex.start,
-	        end = _targets$srcIndex.end;
-	      var duration = this.player.canvasDuration;
+	        end = _targets$srcIndex.end,
+	        duration = _targets$srcIndex.duration;
 	      var startTime = start,
 	        endTime = end;
 	      var isMultiSourced = targets.length > 1 ? true : false;
@@ -6454,7 +6454,6 @@
 	    player.src(options.sources);
 	    player.poster(options.poster);
 	    player.canvasIndex = cIndexRef.current;
-	    player.canvasDuration = canvasDurationRef.current;
 	    player.srcIndex = srcIndex;
 	    player.targets = targets;
 	    player.canvasIsEmpty = canvasIsEmptyRef.current;
@@ -6577,11 +6576,6 @@
 	    player.one('loadedmetadata', function () {
 	      console.log('Player loadedmetadata');
 	      player.duration(canvasDurationRef.current);
-	      /**
-	       * Set property canvasDuration in the player to use in videoJSProgress component.
-	       * This updates the property when player.src() is updates.
-	       */
-	      player.canvasDuration = canvasDurationRef.current;
 
 	      // Reveal player once metadata is loaded
 	      player.removeClass('vjs-disabled');
@@ -6655,15 +6649,6 @@
 	      player.volume(startVolume);
 	      player.srcIndex = srcIndex;
 	      player.duration(canvasDurationRef.current);
-
-	      /**
-	       * Set property canvasDuration in the player to use in videoJSProgress component.
-	       * Video.js' in-built duration function doesn't seem to update as fast as
-	       * we expect to be used in videoJSProgress component.
-	       * Setting this in the ready callback makes sure this is updated to the
-	       * correct value before 'loadstart' event is fired in videoJSProgress component.
-	       */
-	      player.canvasDuration = canvasDurationRef.current;
 	      if (enableTitleLink) {
 	        player.canvasLink = canvasLinkRef.current;
 	      }
@@ -7527,6 +7512,7 @@
 	          };
 	        }
 	        timeFragment.altStart = timeFragment.start;
+	        timeFragment.duration = duration;
 	        manifestDispatch({
 	          canvasTargets: [timeFragment],
 	          type: 'canvasTargets'

diff --git a/docs/build/bundle.9e7f60d7.js b/docs/build/bundle.9e7f60d7.js
diff --git a/docs/build/bundle.ca7b9254.js b/docs/build/bundle.ca7b9254.js
diff --git a/docs/build/bundle.9e7f60d7.js.LICENSE.txt → docs/build/bundle.ca7b9254.js.LICENSE.txt b/docs/build/bundle.9e7f60d7.js.LICENSE.txt → docs/build/bundle.ca7b9254.js.LICENSE.txt
diff --git a/docs/index.html b/docs/index.html
@@ -8,6 +8,6 @@
   </head>
   <body>
     <div id="rsg-root"></div>
-    <script src="build/bundle.9e7f60d7.js"></script>
+    <script src="build/bundle.ca7b9254.js"></script>
   </body>
 </html>