Skip to content

Commit 689172e

Browse files
committed
Merge branch 'release/0.2.14'
2 parents b7d81c1 + f435e50 commit 689172e

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

ios/RNJWPlayer/RNJWPlayerViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
@interface RNJWPlayerViewController : JWPlayerObjCViewController <JWPlayerDelegate, JWPlayerStateDelegate, JWAdDelegate, JWCastDelegate, JWAVDelegate, JWPlayerViewDelegate, JWPlayerViewControllerDelegate, JWDRMContentKeyDataSource, AVPictureInPictureControllerDelegate>
2424

25-
@property(nonatomic, strong)RNJWPlayerView *parentView;
25+
@property(nonatomic, weak)RNJWPlayerView *parentView;
2626

2727
-(void)setDelegates;
2828

ios/RNJWPlayer/RNJWPlayerViewController.m

-17
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,6 @@ -(void)setDelegates
2020
self.player.contentKeyDataSource = self;
2121
}
2222

23-
- (void)removeFromParentViewController
24-
{
25-
[self reset];
26-
}
27-
28-
- (void)dealloc
29-
{
30-
[self reset];
31-
}
32-
33-
-(void)reset
34-
{
35-
[self.player stop];
36-
[self.view removeFromSuperview];
37-
[self willMoveToParentViewController:nil];
38-
}
39-
4023
#pragma mark - JWPlayer Delegate
4124

4225
- (void)jwplayerIsReady:(id<JWPlayer>)player

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-jw-media-player",
3-
"version": "0.2.13",
3+
"version": "0.2.14",
44
"description": "React-native Android/iOS plugin for JWPlayer SDK (https://www.jwplayer.com/)",
55
"main": "index.js",
66
"types": "./index.d.ts",

0 commit comments

Comments
 (0)