@desynova-digital/player 3.7.4 → 3.7.6

package/components/Video.js

@@ -471,6 +471,9 @@ var Video = function (_Component) {
       if (newProps.markers.length && markers.length && newProps.markers[0].values.length !== markers[0].values.length) {
         this.displaySubtitle(newProps.markers);
       }
+      if (newProps.subtitleReadOnly && newProps.subtitleDataList) {
+        this.displaySubtitle(newProps.subtitleDataList);
+      }
     }
 
     // play the video
@@ -743,7 +746,9 @@ var Video = function (_Component) {
     value: function displaySubtitle(marker) {
       var _props14 = this.props,
           markers = _props14.markers,
-          resetSubtitleData = _props14.resetSubtitleData;
+          resetSubtitleData = _props14.resetSubtitleData,
+          subtitleReadOnly = _props14.subtitleReadOnly,
+          subtitleDataList = _props14.subtitleDataList;
       var currentSubtitleObj = this.state.currentSubtitleObj;
 
       if (resetSubtitleData) {
@@ -751,13 +756,18 @@ var Video = function (_Component) {
       }
       var currentTime = this.video.currentTime;
       var currentMarker = marker || markers;
+      if (subtitleReadOnly) {
+        currentMarker = marker || subtitleDataList;
+      }
       if (currentMarker && currentMarker[0] && currentMarker[0].name === "Subtitle") {
         var values = currentMarker[0].values;
         var currentValue = values.filter(function (ele) {
           return ele.start_time <= currentTime && ele.end_time >= currentTime;
         });
         var style = this.getSubtitleStyle(currentValue[0]);
-        if (currentValue && currentValue.length && (currentSubtitleObj.start_time === currentValue[0].start_time || currentSubtitleObj.end_time === currentValue[0].end_time) || Object.keys(currentSubtitleObj).length && currentValue.length === currentSubtitleObj.start_time.length && currentValue.length === currentSubtitleObj.end_time.length) {
+        var currentLine1 = currentSubtitleObj && currentSubtitleObj.line1 || '';
+        var propsLine1 = currentValue[0] && currentValue[0].line1 || '';
+        if (currentValue && currentValue.length && (currentSubtitleObj.start_time === currentValue[0].start_time || currentSubtitleObj.end_time === currentValue[0].end_time) && currentLine1 === propsLine1 || Object.keys(currentSubtitleObj).length && currentValue.length && currentValue.length === currentSubtitleObj.start_time.length && currentValue.length === currentSubtitleObj.end_time.length && currentLine1 === propsLine1) {
           return;
         } else {
           this.setState({

package/components/control-bar/ControlBar.js

@@ -191,6 +191,9 @@ var ControlBar = function (_Component) {
       }, this.props, {
         key: 'volume-menu-button',
         order: 8
+      })), _react2.default.createElement(_SubtitleLanguagesMenuButton2.default, _extends({}, this.props, {
+        key: 'subtitle-menu-button',
+        order: 8
       })), _react2.default.createElement(_CameraButton2.default, {
         order: 9,
         playerType: playerType

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desynova-digital/player",
-  "version": "3.7.4",
+  "version": "3.7.6",
   "description": "Video Player Package for Contido Application",
   "main": "index.js",
   "scripts": {