@desynova-digital/player 3.2.2 → 3.2.3
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/Video.js +18 -17
- package/package.json +1 -1
package/components/Video.js
CHANGED
|
@@ -451,21 +451,20 @@ var Video = function (_Component) {
|
|
|
451
451
|
this.hls.audioTrack = newProps.player.activeAudio.id;
|
|
452
452
|
}
|
|
453
453
|
if (newProps.subtitleObj && newProps.subtitleObj.field && JSON.stringify(newProps.subtitleObj) !== JSON.stringify(currentSubtitleObj)) {
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
// }
|
|
454
|
+
if (newProps.subtitleObj && newProps.subtitleObj.field && !newProps.subtitleObj.field.line1) {
|
|
455
|
+
this.setState({
|
|
456
|
+
currentSubtitleObj: {}
|
|
457
|
+
});
|
|
458
|
+
} else if (newProps.subtitleObj && newProps.subtitleObj.field && newProps.subtitleObj.field.line1) {
|
|
459
|
+
var style = this.getSubtitleStyle(newProps.subtitleObj.field);
|
|
460
|
+
this.setState({
|
|
461
|
+
currentSubtitleObj: {
|
|
462
|
+
line1: newProps.subtitleObj.field.line1,
|
|
463
|
+
line2: newProps.subtitleObj.field.line2,
|
|
464
|
+
style: style
|
|
465
|
+
}
|
|
466
|
+
});
|
|
467
|
+
}
|
|
469
468
|
}
|
|
470
469
|
if (newProps.markers.length && markers.length && newProps.markers[0].values.length !== markers[0].values.length) {
|
|
471
470
|
this.displaySubtitle(newProps.markers);
|
|
@@ -745,9 +744,11 @@ var Video = function (_Component) {
|
|
|
745
744
|
key: 'displaySubtitle',
|
|
746
745
|
value: function displaySubtitle(marker) {
|
|
747
746
|
var _props14 = this.props,
|
|
748
|
-
|
|
749
|
-
|
|
747
|
+
markers = _props14.markers,
|
|
748
|
+
resetSubtitleData = _props14.resetSubtitleData;
|
|
750
749
|
|
|
750
|
+
resetSubtitleData();
|
|
751
|
+
var currentTime = this.video.currentTime;
|
|
751
752
|
var currentMarker = marker || markers;
|
|
752
753
|
if (currentMarker && currentMarker[0] && currentMarker[0].name === "Subtitle") {
|
|
753
754
|
var values = currentMarker[0].values;
|