@desynova-digital/player 3.7.3 → 3.7.7

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
@@ -741,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.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
+            }
+          });
+        }
       }
     }
 

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/components/control-bar/SubtitleLanguagesMenuButton.js

@@ -20,6 +20,8 @@ var _Menu = require('../Menu');
 
 var _Menu2 = _interopRequireDefault(_Menu);
 
+var _components = require('@desynova-digital/components');
+
 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"); } }
@@ -33,10 +35,25 @@ var propTypes = {
   player: _propTypes.PropTypes.instanceOf(Object)
 };
 
+var IconButtonStyles = (0, _styledComponents2.default)(_components.Button).withConfig({
+  displayName: 'SubtitleLanguagesMenuButton__IconButtonStyles',
+  componentId: 'sc-1g8hfwo-0'
+})(['border:none;pointer-events:stroke;background-color:', ';svg{path{fill:', ' !important;}}&:hover,&:focus,&:active{border:none;border-radius:', ';svg{path{fill:', ' !important;}}}'], function (props) {
+  return props.backgroundColor;
+}, function (_ref) {
+  var svgFillDefault = _ref.svgFillDefault;
+  return svgFillDefault;
+}, function (props) {
+  return props.borderRadius ? props.borderRadius : 'none';
+}, function (_ref2) {
+  var hoverColor = _ref2.hoverColor;
+  return hoverColor;
+});
+
 var SubtitleMenuBlock = (0, _styledComponents2.default)('div').withConfig({
   displayName: 'SubtitleLanguagesMenuButton__SubtitleMenuBlock',
-  componentId: 'sc-1g8hfwo-0'
-})(['text-align:left;background:transparent;cursor:pointer;border-bottom:1px solid #eeeeee;&:last-child{border:none;}&:hover,&:focus{background:rgba(0,206,198,0.1);}p{padding 15px;font-family:SFUIText-Medium;font-size:12px;white-space:nowrap;}']);
+  componentId: 'sc-1g8hfwo-1'
+})(['display:flex;justify-content:space-between;text-align:left;background:transparent;cursor:pointer;border-bottom:1px solid #eeeeee;&:last-child{border:none;}&:hover,&:focus{background:rgba(0,206,198,0.1);}p{padding 15px;font-family:SFUIText-Medium;font-size:12px;white-space:nowrap;}.icon-wrapper{padding:9px;}.tooltip-container{.tooltip-block{white-space:nowrap;padding:0px;left:-15px;:after{right:0px;left:auto;}p{text-transform:capitalize;font-size:10px;padding:12px;}}}']);
 
 var SubtitleLanguagesMenuButton = function (_Component) {
   _inherits(SubtitleLanguagesMenuButton, _Component);
@@ -116,6 +133,30 @@ var SubtitleLanguagesMenuButton = function (_Component) {
                     style: activeLanguage === subtitle.subtitle_info_id ? { color: '#00cec6', pointerEvents: 'none' } : { color: '#333333' }
                   },
                   subtitle.title
+                ),
+                subtitle.srt_file_name && _react2.default.createElement(
+                  'div',
+                  { className: 'icon-wrapper' },
+                  _react2.default.createElement(IconButtonStyles, {
+                    display: 'rounded',
+                    appearance: 'cta',
+                    icon: 'download',
+                    label: 'Download',
+                    iconWidth: 14,
+                    iconHeight: 14,
+                    width: 22,
+                    height: 22,
+                    hoverColor: '#FFFFFF',
+                    hoverBackgroundColor: '#00cec6',
+                    backgroundColor: activeLanguage === subtitle.subtitle_info_id ? '#00cec6' : 'rgb(51,51,51,0.1)',
+                    svgFillDefault: activeLanguage === subtitle.subtitle_info_id ? '#FFFFFF' : 'rgb(51,51,51)',
+                    borderRadius: '50%',
+                    onClick: function onClick(e) {
+                      console.log("icon clicked1");
+                      window.open(subtitle.srt_file_name, '_blank');
+                      e.stopPropagation();
+                    }
+                  })
                 )
               );
             })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desynova-digital/player",
-  "version": "3.7.3",
+  "version": "3.7.7",
   "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,