@desynova-digital/player 3.7.3 → 3.7.4
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 +2 -2
- package/components/Video.js +16 -7
- package/package.json +1 -1
- package/reducers/player.js +1 -1
package/components/Shortcut.js
CHANGED
|
@@ -201,8 +201,8 @@ var Shortcut = function (_Component) {
|
|
|
201
201
|
if (playerReadOnlyMode || disablePlayerActions.includes("marking_controls")) {
|
|
202
202
|
return;
|
|
203
203
|
}
|
|
204
|
+
var createPoint = true;
|
|
204
205
|
if (playerType !== 'panel') {
|
|
205
|
-
var createPoint = true;
|
|
206
206
|
if (markers && markers.length && markers[0].values && markers[0].values.length) {
|
|
207
207
|
var markerArr = markers[0].values;
|
|
208
208
|
if (Object.keys(player.selectedMarker).length) {
|
|
@@ -230,7 +230,7 @@ var Shortcut = function (_Component) {
|
|
|
230
230
|
// }
|
|
231
231
|
}
|
|
232
232
|
}
|
|
233
|
-
if (player.leftMarker > -1 && player.currentTime > -1 && player.markerCreate) {
|
|
233
|
+
if (player.leftMarker > -1 && player.currentTime > -1 && player.markerCreate && createPoint && player.currentTime > player.leftMarker) {
|
|
234
234
|
actions.handleMarkerPointChange('create');
|
|
235
235
|
onAddMarker(player.leftMarker, player.currentTime);
|
|
236
236
|
}
|
package/components/Video.js
CHANGED
|
@@ -461,6 +461,8 @@ var Video = function (_Component) {
|
|
|
461
461
|
currentSubtitleObj: {
|
|
462
462
|
line1: newProps.subtitleObj.field.line1,
|
|
463
463
|
line2: newProps.subtitleObj.field.line2,
|
|
464
|
+
start_time: newProps.subtitleObj.field.in_time,
|
|
465
|
+
end_time: newProps.subtitleObj.field.out_time,
|
|
464
466
|
style: style
|
|
465
467
|
}
|
|
466
468
|
});
|
|
@@ -742,6 +744,7 @@ var Video = function (_Component) {
|
|
|
742
744
|
var _props14 = this.props,
|
|
743
745
|
markers = _props14.markers,
|
|
744
746
|
resetSubtitleData = _props14.resetSubtitleData;
|
|
747
|
+
var currentSubtitleObj = this.state.currentSubtitleObj;
|
|
745
748
|
|
|
746
749
|
if (resetSubtitleData) {
|
|
747
750
|
resetSubtitleData();
|
|
@@ -754,13 +757,19 @@ var Video = function (_Component) {
|
|
|
754
757
|
return ele.start_time <= currentTime && ele.end_time >= currentTime;
|
|
755
758
|
});
|
|
756
759
|
var style = this.getSubtitleStyle(currentValue[0]);
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
|
|
760
|
+
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) {
|
|
761
|
+
return;
|
|
762
|
+
} else {
|
|
763
|
+
this.setState({
|
|
764
|
+
currentSubtitleObj: {
|
|
765
|
+
line1: currentValue[0] && currentValue[0].line1 || '',
|
|
766
|
+
line2: currentValue[0] && currentValue[0].line2 || '',
|
|
767
|
+
start_time: currentValue[0] && currentValue[0].start_time || '',
|
|
768
|
+
end_time: currentValue[0] && currentValue[0].end_time || '',
|
|
769
|
+
style: style
|
|
770
|
+
}
|
|
771
|
+
});
|
|
772
|
+
}
|
|
764
773
|
}
|
|
765
774
|
}
|
|
766
775
|
|
package/package.json
CHANGED