ovenplayer 0.10.39 → 0.10.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ovenplayer",
-  "version": "0.10.39",
+  "version": "0.10.40",
   "description": "OvenPlayer is Open-Source HTML5 Player. OvenPlayer supports WebRTC Signaling from OvenMediaEngine for Sub-Second Latency Streaming.",
   "main": "dist/ovenplayer.js",
   "scripts": {

package/src/js/api/Configurator.js

@@ -1,4 +1,5 @@
 import _ from "utils/underscore";
+import deepMerge from "utils/deepMerge";
 
 import {
     CONTENT_TIME_MODE_CHANGED, SYSTEM_TEXT
@@ -82,12 +83,13 @@ const Configurator = function (options, provider) {
                 let currentSystemText = _.findWhere(SYSTEM_TEXT, { "lang": userCustumSystemText[i].lang });
                 if (currentSystemText) {
                     //validate & update
-                    Object.assign(currentSystemText, userCustumSystemText[i]);
+                    deepMerge(currentSystemText, userCustumSystemText[i]);
                 } else {
                     //create
                     currentSystemText = _.findWhere(SYSTEM_TEXT, { "lang": "en" });
                     currentSystemText.lang = userCustumSystemText[i].lang;
-                    SYSTEM_TEXT.push(Object.assign(userCustumSystemText[i], currentSystemText));
+                    const newMerged = deepMerge({}, currentSystemText, userCustumSystemText[i]);
+                    SYSTEM_TEXT.push(newMerged);
                 }
             }
         }

package/src/js/utils/deepMerge.js

@@ -0,0 +1,42 @@
+/**
+ * Performs a deep merge of the `source` object's properties into the `target` object.
+ * For nested objects, the function recurses; otherwise it directly overwrites values.
+ *
+ * @param {Object} target - The object to which properties are merged.
+ * @param {Object} source - The object containing properties to be copied.
+ * @returns {Object} The modified `target` object reference.
+ *
+ * @example
+ * const objA = {
+ *   a: 1,
+ *   b: { x: 10, y: 20 }
+ * };
+ * const objB = {
+ *   b: { y: 999, z: 50 },
+ *   c: 3
+ * };
+ *
+ * deepMerge(objA, objB);
+ *  Result: objA = {
+ *    a: 1,
+ *    b: { x: 10, y: 999, z: 50 },
+ *    c: 3
+ *  }
+ */
+export default function deepMerge(target, source) {
+  for (let key in source) {
+    if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (
+        typeof source[key] === "object" &&
+        source[key] !== null &&
+        typeof target[key] === "object" &&
+        target[key] !== null
+      ) {
+        deepMerge(target[key], source[key]);
+      } else {
+        target[key] = source[key];
+      }
+    }
+  }
+  return target;
+}

package/src/js/view/components/controls/timeDisplay.js

@@ -19,6 +19,8 @@ const TimeDisplay = function ($container, api, data) {
   let hlsLive = false;
   let nativeHlsLive = false;
 
+  let currVodPosition = 0;
+
   function convertHumanizeTime(time) {
     return naturalHms(time);
   }
@@ -29,6 +31,7 @@ const TimeDisplay = function ($container, api, data) {
   }
 
   const onRendered = function ($current, template) {
+    currVodPosition = 0;
     let isTimecode = api.isTimecodeMode();
     $position = $current.find(".op-time-current");
     $duration = $current.find(".op-time-duration");
@@ -48,19 +51,25 @@ const TimeDisplay = function ($container, api, data) {
       if (isTimecode) {
         $duration.text(convertHumanizeTime(data.duration));
       } else {
+        $position.text(0);
         $duration.text(Math.round(data.duration * api.getFramerate()) + " (" + api.getFramerate() + "fps)");
       }
 
       api.on(CONTENT_TIME_MODE_CHANGED, function (isTimecodeMode) {
         isTimecode = isTimecodeMode;
         if (isTimecode) {
+          $position.text(convertHumanizeTime(currVodPosition));
           $duration.text(convertHumanizeTime(data.duration));
         } else {
+          $position.text(Math.round(currVodPosition * api.getFramerate()));
           $duration.text(Math.round(data.duration * api.getFramerate()) + " (" + api.getFramerate() + "fps)");
         }
       }, template);
 
       api.on(CONTENT_TIME, function (data) {
+
+        currVodPosition = data.position;
+
         if (isTimecode) {
           $position.text(convertHumanizeTime(data.position));
         } else {

package/src/js/view/view.js

@@ -409,10 +409,11 @@ const View = function($container){
             }
         }
 
-        api.showControls = function (show) {
+        api.showControls = function (show, keepOpen) {
             if (show) {
                 $playerRoot.removeClass("op-no-controls");
-                setHide(false, true);
+                let autoHide = !keepOpen
+                setHide(false, autoHide);
             } else {
                 $playerRoot.addClass("op-no-controls");
             }