@desynova-digital/player 3.5.0 → 3.5.1

package/components/Player.js

@@ -290,9 +290,9 @@ var Player = function (_Component) {
     }
   }, {
     key: 'onSegmentClick',
-    value: function onSegmentClick(start_time, end_time) {
+    value: function onSegmentClick(start_time, end_time, seek) {
       this.actions.handleMarkerUpdate(start_time, end_time);
-      this.actions.play();
+      seek ? this.actions.pause() : this.actions.play();
       this.actions.handleVideoRewind(false);
       this.actions.seek(start_time);
       this.actions.handleVideoPreview(true);

package/components/Shortcut.js

@@ -201,8 +201,8 @@ var Shortcut = function (_Component) {
         if (playerReadOnlyMode || disablePlayerActions.includes("marking_controls")) {
           return;
         }
+        var createPoint = true;
         if (playerType !== 'panel') {
-          var createPoint = true;
           if (markers && markers.length && markers[0].values && markers[0].values.length) {
             var markerArr = markers[0].values;
             if (Object.keys(player.selectedMarker).length) {
@@ -230,7 +230,7 @@ var Shortcut = function (_Component) {
             // }
           }
         }
-        if (player.leftMarker > -1 && player.currentTime > -1 && player.markerCreate) {
+        if (player.leftMarker > -1 && player.currentTime > -1 && player.markerCreate && createPoint && player.currentTime > player.leftMarker) {
           actions.handleMarkerPointChange('create');
           onAddMarker(player.leftMarker, player.currentTime);
         }

package/components/Video.js

@@ -461,6 +461,8 @@ var Video = function (_Component) {
             currentSubtitleObj: {
               line1: newProps.subtitleObj.field.line1,
               line2: newProps.subtitleObj.field.line2,
+              start_time: newProps.subtitleObj.field.in_time,
+              end_time: newProps.subtitleObj.field.out_time,
               style: style
             }
           });
@@ -469,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
@@ -551,7 +556,6 @@ var Video = function (_Component) {
     key: 'forward',
     value: function forward(seconds) {
       this.seek(this.video.currentTime + seconds);
-      this.displaySubtitle();
     }
 
     // jump back x seconds
@@ -560,7 +564,6 @@ var Video = function (_Component) {
     key: 'replay',
     value: function replay(seconds) {
       this.forward(-seconds);
-      this.displaySubtitle();
     }
 
     // enter or exist full screen
@@ -706,7 +709,6 @@ var Video = function (_Component) {
       if (onDurationChange) {
         onDurationChange.apply(undefined, arguments);
       }
-      this.displaySubtitle();
     }
 
     /*
@@ -728,7 +730,6 @@ var Video = function (_Component) {
       if (onProgress) {
         onProgress.apply(undefined, arguments);
       }
-      this.displaySubtitle();
     }
   }, {
     key: 'getSubtitleStyle',
@@ -745,26 +746,40 @@ 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) {
         resetSubtitleData();
       }
       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.in_time <= currentTime && ele.out_time >= currentTime;
+          return ele.start_time <= currentTime && ele.end_time >= currentTime;
         });
         var style = this.getSubtitleStyle(currentValue[0]);
-        this.setState({
-          currentSubtitleObj: {
-            line1: currentValue[0] && currentValue[0].line1 || '',
-            line2: currentValue[0] && currentValue[0].line2 || '',
-            style: style
-          }
-        });
+        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({
+            currentSubtitleObj: {
+              line1: currentValue[0] && currentValue[0].line1 || '',
+              line2: currentValue[0] && currentValue[0].line2 || '',
+              start_time: currentValue[0] && currentValue[0].start_time || '',
+              end_time: currentValue[0] && currentValue[0].end_time || '',
+              style: style
+            }
+          });
+        }
       }
     }
 
@@ -828,7 +843,6 @@ var Video = function (_Component) {
       if (onSeeking) {
         onSeeking.apply(undefined, arguments);
       }
-      this.displaySubtitle();
     }
 
     /*

package/components/control-bar/CameraButton.js

@@ -18,6 +18,8 @@ var _styledComponents2 = _interopRequireDefault(_styledComponents);
 
 var _components = require("@desynova-digital/components");
 
+var _utils = require("../../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -56,7 +58,11 @@ var CameraButton = function (_Component) {
                 onTakeSnapshot = _props.onTakeSnapshot,
                 video = _props.video;
 
-            onTakeSnapshot(video.currentTime);
+            var timeObj = {
+                "thumbnail": (0, _utils.secondsToTime)(this.props.video.currentTime, this.props.frameRate, this.props.initialTime),
+                "thumbnail_seconds": this.props.video.currentTime
+            };
+            onTakeSnapshot(timeObj);
         }
     }, {
         key: "render",

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.5.0",
+  "version": "3.5.1",
   "description": "Video Player Package for Contido Application",
   "main": "index.js",
   "scripts": {

package/reducers/player.js

@@ -45,7 +45,7 @@ var initialState = {
   previewActive: false,
   audioTracksArr: [],
   activeAudio: {},
-  markerCreate: true,
+  markerCreate: false,
   rewindActive: false,
   HLSConfig: {
     debug: true,