@desynova-digital/player 3.9.9 → 3.9.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/components/Shortcut.js
CHANGED
|
@@ -199,12 +199,12 @@ var Shortcut = /*#__PURE__*/function (_Component) {
|
|
|
199
199
|
// player.currentTime
|
|
200
200
|
// );
|
|
201
201
|
var data = {
|
|
202
|
-
markerType: playerSelectedMarker.
|
|
202
|
+
markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
|
|
203
203
|
markerPos: 'left',
|
|
204
204
|
currentTime: player.currentTime
|
|
205
205
|
};
|
|
206
206
|
onAddMarker(player.currentTime, -1, '', true, data);
|
|
207
|
-
if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update')) {
|
|
207
|
+
if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
|
|
208
208
|
onAddMarker(player.currentTime, playerSelectedMarker.rightMarker, 'update');
|
|
209
209
|
}
|
|
210
210
|
}
|
|
@@ -251,11 +251,11 @@ var Shortcut = /*#__PURE__*/function (_Component) {
|
|
|
251
251
|
// currentTime: player.currentTime
|
|
252
252
|
// );
|
|
253
253
|
var data = {
|
|
254
|
-
markerType: playerSelectedMarker.
|
|
254
|
+
markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
|
|
255
255
|
markerPos: 'right',
|
|
256
256
|
currentTime: player.currentTime
|
|
257
257
|
};
|
|
258
|
-
if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update')) {
|
|
258
|
+
if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
|
|
259
259
|
onAddMarker(playerSelectedMarker.leftMarker, player.currentTime, 'update', false, data);
|
|
260
260
|
}
|
|
261
261
|
//Commented for CN-632.
|
package/components/Video.js
CHANGED
|
@@ -95,7 +95,9 @@ var defaultProps = {
|
|
|
95
95
|
aspectRatio: 'auto',
|
|
96
96
|
crossOrigin: 'anonymous'
|
|
97
97
|
};
|
|
98
|
-
var SubTitleSection = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n position: absolute;\n font-family: SFUIText-Regular;\n font-size: 16px;\n bottom: 20px;\n width: 100%;\n display: flex;\n justify-content: center;\n text-align: center;\n color: #FFFFFF;\n height: 90%;\n align-items: center;\n \n .subtitleContainer{\n border-radius: 4px;\n width: fit-content;\n background: #000000;\n opacity: 0.9;\n padding:
|
|
98
|
+
var SubTitleSection = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n position: absolute;\n font-family: SFUIText-Regular;\n font-size: 16px;\n bottom: 20px;\n width: 100%;\n display: flex;\n justify-content: center;\n text-align: center;\n color: #FFFFFF;\n height: 90%;\n align-items: center;\n \n .subtitleContainer{\n border-radius: 4px;\n width: fit-content;\n background: #000000;\n opacity: 0.9;\n padding: ", ";\n line-height: 20px;\n position: absolute;\n }\n"])), function (props) {
|
|
99
|
+
return props.currentSubtitleObj && props.currentSubtitleObj.line1 ? '8px 10px' : '0px';
|
|
100
|
+
});
|
|
99
101
|
var VideoBlock = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n position: relative;\n &.video-react-player-block {\n position: relative;\n transition: all 0.1s ease-in-out;\n -moz-transition: all 0.1s ease-in-out;\n -webkit-transition: all 0.1s ease-in-out;\n -ms-transition: all 0.1s ease-in-out;\n -o-transition: all 0.1s ease-in-out;\n video {\n position: absolute;\n top: 0;\n left: 0;\n width: 100%;\n height: 100%;\n right: 0;\n bottom: 0;\n }\n .audio-tracks {\n position: relative;\n display: flex;\n background: rgba(0, 0, 0, 0.5);\n color: #fff;\n z-index: 10;\n position: absolute;\n width: 100%;\n bottom: 0;\n p {\n cursor: pointer;\n padding: 10px;\n }\n }\n .loader-container {\n width: 100%;\n height: 100%;\n display: flex;\n justify-content: center;\n align-items: center;\n position: absolute;\n z-index: 10;\n background: rgba(0,0,0,0.5)\n }\n }\n &.ratio-border {\n border: 1px solid rgba(255, 255, 255, 0.5);\n &:after {\n content: '16:9 Safe Area';\n position: absolute;\n color: #fff;\n font-family: SFUIText-Regular;\n font-size: 12px;\n transform: rotate(-90deg);\n top: 20%;\n left: -50px;\n }\n }\n"])));
|
|
100
102
|
var Video = /*#__PURE__*/function (_Component) {
|
|
101
103
|
_inherits(Video, _Component);
|
|
@@ -1231,6 +1233,7 @@ var Video = /*#__PURE__*/function (_Component) {
|
|
|
1231
1233
|
style: _objectSpread({}, watermark)
|
|
1232
1234
|
}, userEmail), /*#__PURE__*/_react["default"].createElement(SubTitleSection, {
|
|
1233
1235
|
id: "outer",
|
|
1236
|
+
currentSubtitleObj: currentSubtitleObj,
|
|
1234
1237
|
onClick: function onClick() {
|
|
1235
1238
|
return _this5.handleSubtitleContainerClick();
|
|
1236
1239
|
}
|
|
@@ -128,7 +128,8 @@ var ProgressControl = /*#__PURE__*/function (_Component) {
|
|
|
128
128
|
playerType = _this$props2.playerType,
|
|
129
129
|
_this$props2$player = _this$props2.player,
|
|
130
130
|
userActivity = _this$props2$player.userActivity,
|
|
131
|
-
isFullscreen = _this$props2$player.isFullscreen
|
|
131
|
+
isFullscreen = _this$props2$player.isFullscreen,
|
|
132
|
+
duration = _this$props2$player.duration;
|
|
132
133
|
var mouseTime = this.state.mouseTime;
|
|
133
134
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(ProgressControlBlock, {
|
|
134
135
|
controlType: controlType,
|
|
@@ -152,7 +153,7 @@ var ProgressControl = /*#__PURE__*/function (_Component) {
|
|
|
152
153
|
}
|
|
153
154
|
}, this.props))), controlType === 'advanced' && !isFullscreen ? /*#__PURE__*/_react["default"].createElement(MarkerTagsBlock, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
154
155
|
className: "empty-block"
|
|
155
|
-
})) : null), controlType === 'advanced' && !isFullscreen ? /*#__PURE__*/_react["default"].createElement(_PointersBar["default"], this.props) : null);
|
|
156
|
+
})) : null), controlType === 'advanced' && !isFullscreen && duration ? /*#__PURE__*/_react["default"].createElement(_PointersBar["default"], this.props) : null);
|
|
156
157
|
}
|
|
157
158
|
}]);
|
|
158
159
|
return ProgressControl;
|