@desynova-digital/player 3.9.0 → 3.9.2

package/components/MarkerBar.js

@@ -98,15 +98,16 @@ var MarkerBar = function (_Component) {
     value: function render() {
       var _props = this.props,
           player = _props.player,
-          controlType = _props.controlType;
+          controlType = _props.controlType,
+          playerSelectedMarker = _props.playerSelectedMarker;
 
-      var leftMarkerPosition = (this.getMarkerPosition(player.leftMarker) * 100).toFixed(2) + '%';
-      var rightMarkerPosition = (this.getMarkerPosition(player.rightMarker) * 100).toFixed(2) + '%';
+      var leftMarkerPosition = (this.getMarkerPosition(playerSelectedMarker.leftMarker) * 100).toFixed(2) + '%';
+      var rightMarkerPosition = (this.getMarkerPosition(playerSelectedMarker.rightMarker) * 100).toFixed(2) + '%';
 
       return _react2.default.createElement(
         MarkerBlock,
         { controlType: controlType, isFullscreen: player.isFullscreen },
-        player.leftMarker > -1 ? _react2.default.createElement(
+        playerSelectedMarker.leftMarker > -1 ? _react2.default.createElement(
           'div',
           {
             className: 'marker marker-left',
@@ -114,7 +115,7 @@ var MarkerBar = function (_Component) {
           },
           _react2.default.createElement(_components.Icon, { name: 'marker', width: 8, height: 7, color: '#00cec6' })
         ) : null,
-        player.rightMarker > -1 ? _react2.default.createElement(
+        playerSelectedMarker.rightMarker > -1 ? _react2.default.createElement(
           'div',
           {
             className: 'marker marker-right',

package/components/Shortcut.js

@@ -170,29 +170,29 @@ var Shortcut = function (_Component) {
               });
             }
             markerArr.filter(function (marker) {
-              if (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || player.leftMarker > -1 && player.currentTime > marker.start_time && player.leftMarker < marker.start_time || player.leftMarker > -1 && player.currentTime < marker.start_time && player.leftMarker > marker.end_time) {
+              if (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && player.currentTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && player.currentTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
                 createPoint = false;
               }
             });
           }
-          if (!createPoint && player.markerType === 'update' && player.currentTime > player.selectedMarker.leftMarker && player.currentTime < player.selectedMarker.rightMarker) {
+          if (!createPoint && playerSelectedMarker.markerType === 'update' && player.currentTime > player.selectedMarker.leftMarker && player.currentTime < player.selectedMarker.rightMarker) {
             createPoint = true;
           }
           if (createPoint) {
-            if (player.rightMarker < 0 || player.rightMarker > -1 && player.currentTime < player.rightMarker) {
+            if (playerSelectedMarker.rightMarker < 0 || playerSelectedMarker.rightMarker > -1 && player.currentTime < playerSelectedMarker.rightMarker) {
               // actions.handleMarkerPointChange(
               //   player.markerType !== 'update' ? 'add' : 'update',
               //   'left',
               //   player.currentTime
               // );
               var data = {
-                markerType: player.markerType !== 'update' ? 'add' : 'update',
+                markerType: playerSelectedMarker.markerType !== 'update' ? 'add' : 'update',
                 markerPos: 'left',
                 currentTime: player.currentTime
               };
               onAddMarker(player.currentTime, -1, '', true, data);
-              if (player.leftMarker > -1 && player.rightMarker > -1 && (!player.markerCreate || player.markerType === 'update')) {
-                onAddMarker(player.currentTime, player.rightMarker, 'update');
+              if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update')) {
+                onAddMarker(player.currentTime, playerSelectedMarker.rightMarker, 'update');
               }
             }
           }
@@ -223,7 +223,7 @@ var Shortcut = function (_Component) {
               });
             }
             markerArr.filter(function (marker) {
-              if (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || player.leftMarker > -1 && player.currentTime > marker.start_time && player.leftMarker < marker.start_time || player.leftMarker > -1 && player.currentTime < marker.start_time && player.leftMarker > marker.end_time) {
+              if (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && player.currentTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && player.currentTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
                 createPoint = false;
               }
             });
@@ -295,10 +295,12 @@ var Shortcut = function (_Component) {
     }, {
       keyCode: 68, // D Key
       handle: function handle(player, actions) {
-        if ((player.leftMarker > -1 || player.rightMarker > -1) && player.markerType === 'create') {
+        var playerSelectedMarker = _this.props.playerSelectedMarker;
+
+        if ((playerSelectedMarker.leftMarker > -1 || playerSelectedMarker.rightMarker > -1) && playerSelectedMarker.markerType === 'create') {
           var onDeleteMarker = _this.props.onDeleteMarker;
+          // actions.handleMarkerPointChange('delete');
 
-          actions.handleMarkerPointChange('delete');
           onDeleteMarker();
         }
       }
@@ -326,15 +328,19 @@ var Shortcut = function (_Component) {
     }, {
       keyCode: 81, // Q Key
       handle: function handle(player, actions) {
-        if (player.leftMarker > -1) {
-          actions.seek(player.leftMarker);
+        var leftMarker = _this.props.playerSelectedMarker.leftMarker;
+
+        if (leftMarker > -1) {
+          actions.seek(leftMarker);
         }
       }
     }, {
       keyCode: 87, // W Key
       handle: function handle(player, actions) {
-        if (player.rightMarker > -1) {
-          actions.seek(player.rightMarker);
+        var rightMarker = _this.props.playerSelectedMarker.rightMarker;
+
+        if (rightMarker > -1) {
+          actions.seek(rightMarker);
         }
       }
     }];

package/components/Video.js

@@ -98,7 +98,8 @@ var propTypes = {
   onResize: _propTypes.PropTypes.func,
   aspectRatio: _propTypes.PropTypes.string,
   onPlayerClose: _propTypes.PropTypes.func,
-  userEmail: _propTypes.PropTypes.string
+  userEmail: _propTypes.PropTypes.string,
+  playerSelectedMarker: _propTypes.PropTypes.instanceOf(Object)
 };
 
 var defaultProps = {
@@ -990,11 +991,10 @@ var Video = function (_Component) {
     key: 'handleTimeUpdate',
     value: function handleTimeUpdate() {
       var _props25 = this.props,
-          _props25$player = _props25.player,
-          previewActive = _props25$player.previewActive,
-          rightMarker = _props25$player.rightMarker,
+          previewActive = _props25.player.previewActive,
           actions = _props25.actions,
-          onTimeUpdate = _props25.onTimeUpdate;
+          onTimeUpdate = _props25.onTimeUpdate,
+          rightMarker = _props25.playerSelectedMarker.rightMarker;
 
       actions.handleTimeUpdate(this.getProperties());
       if (previewActive && this.video.currentTime >= rightMarker) {
@@ -1327,26 +1327,26 @@ var Video = function (_Component) {
           SubTitleSection,
           {
             onClick: function onClick() {
-              return _this5.handleClick();
+              return _this5.handleSubtitleClick();
             }
           },
           _react2.default.createElement(
             'span',
             { className: 'subtitleContainer', style: _extends({}, currentSubtitleObj.style) },
-            _react2.default.createElement(
+            currentSubtitleObj.line1 && _react2.default.createElement(
               'pre',
               null,
               ' ',
               currentSubtitleObj.line1,
               ' '
-            ),
-            _react2.default.createElement(
+            ) || null,
+            currentSubtitleObj.line2 && _react2.default.createElement(
               'pre',
               null,
               ' ',
               currentSubtitleObj.line2,
               ' '
-            )
+            ) || null
           )
         )
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desynova-digital/player",
-  "version": "3.9.0",
+  "version": "3.9.2",
   "description": "Video Player Package for Contido Application",
   "main": "index.js",
   "scripts": {
@@ -53,8 +53,8 @@
     "webpack-dev-server": "^3.11.0"
   },
   "dependencies": {
-    "@desynova-digital/components": "^8.15.1",
-    "@desynova-digital/tokens": "^8.15.1",
+    "@desynova-digital/components": "^8.16.0",
+    "@desynova-digital/tokens": "^8.16.0",
     "hls.js": "^0.11.0",
     "latest-version": "^4.0.0",
     "prettycli": "^1.4.3",