Merge branch 'master' of https://github.com/nfb-onf/react-native-video
# Conflicts: # ios/RCTVideoPlayerViewController.m # ios/Video/RCTVideo.m
This commit is contained in:
8
Video.js
8
Video.js
@@ -151,12 +151,6 @@ export default class Video extends Component {
|
||||
}
|
||||
};
|
||||
|
||||
_onCaptionsDeviceSetting = (event) => {
|
||||
if (this.props.onCaptionsDeviceSetting) {
|
||||
this.props.onCaptionsDeviceSetting(event.nativeEvent);
|
||||
}
|
||||
};
|
||||
|
||||
_onPlaybackStalled = (event) => {
|
||||
if (this.props.onPlaybackStalled) {
|
||||
this.props.onPlaybackStalled(event.nativeEvent);
|
||||
@@ -247,7 +241,6 @@ export default class Video extends Component {
|
||||
onVideoFullscreenPlayerWillDismiss: this._onFullscreenPlayerWillDismiss,
|
||||
onVideoFullscreenPlayerDidDismiss: this._onFullscreenPlayerDidDismiss,
|
||||
onReadyForDisplay: this._onReadyForDisplay,
|
||||
onCaptionsDeviceSetting: this._onCaptionsDeviceSetting,
|
||||
onPlaybackStalled: this._onPlaybackStalled,
|
||||
onPlaybackResume: this._onPlaybackResume,
|
||||
onPlaybackRateChange: this._onPlaybackRateChange,
|
||||
@@ -386,7 +379,6 @@ Video.propTypes = {
|
||||
onFullscreenPlayerWillDismiss: PropTypes.func,
|
||||
onFullscreenPlayerDidDismiss: PropTypes.func,
|
||||
onReadyForDisplay: PropTypes.func,
|
||||
onCaptionsDeviceSetting: PropTypes.func,
|
||||
onPlaybackStalled: PropTypes.func,
|
||||
onPlaybackResume: PropTypes.func,
|
||||
onPlaybackRateChange: PropTypes.func,
|
||||
|
Reference in New Issue
Block a user