瀏覽代碼

Merge branch 'master' into mr/cve-2020-6506

mrcoinbase 4 年之前
父節點
當前提交
774f795456
No account linked to committer's email address
共有 4 個文件被更改,包括 8 次插入4 次删除
  1. 4
    0
      apple/RNCWebView.h
  2. 2
    2
      apple/RNCWebView.m
  3. 1
    1
      package.json
  4. 1
    1
      react-native-webview.podspec

+ 4
- 0
apple/RNCWebView.h 查看文件

64
 @property (nonatomic, assign) BOOL ignoreSilentHardwareSwitch;
64
 @property (nonatomic, assign) BOOL ignoreSilentHardwareSwitch;
65
 @property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
65
 @property (nonatomic, copy) NSString * _Nullable allowingReadAccessToURL;
66
 @property (nonatomic, assign) BOOL pullToRefreshEnabled;
66
 @property (nonatomic, assign) BOOL pullToRefreshEnabled;
67
+#if !TARGET_OS_OSX
67
 @property (nonatomic, weak) UIRefreshControl * refreshControl;
68
 @property (nonatomic, weak) UIRefreshControl * refreshControl;
69
+#endif
68
 
70
 
69
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
71
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000 /* iOS 13 */
70
 @property (nonatomic, assign) WKContentMode contentMode;
72
 @property (nonatomic, assign) WKContentMode contentMode;
78
 - (void)goBack;
80
 - (void)goBack;
79
 - (void)reload;
81
 - (void)reload;
80
 - (void)stopLoading;
82
 - (void)stopLoading;
83
+#if !TARGET_OS_OSX
81
 - (void)addPullToRefreshControl;
84
 - (void)addPullToRefreshControl;
82
 - (void)pullToRefresh:(UIRefreshControl *)refreshControl;
85
 - (void)pullToRefresh:(UIRefreshControl *)refreshControl;
86
+#endif
83
 
87
 
84
 @end
88
 @end

+ 2
- 2
apple/RNCWebView.m 查看文件

1136
     [_webView reload];
1136
     [_webView reload];
1137
   }
1137
   }
1138
 }
1138
 }
1139
-
1139
+#if !TARGET_OS_OSX
1140
 - (void)addPullToRefreshControl
1140
 - (void)addPullToRefreshControl
1141
 {
1141
 {
1142
     UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
1142
     UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init];
1151
     [refreshControl endRefreshing];
1151
     [refreshControl endRefreshing];
1152
 }
1152
 }
1153
 
1153
 
1154
-#if !TARGET_OS_OSX
1154
+
1155
 - (void)setPullToRefreshEnabled:(BOOL)pullToRefreshEnabled
1155
 - (void)setPullToRefreshEnabled:(BOOL)pullToRefreshEnabled
1156
 {
1156
 {
1157
     _pullToRefreshEnabled = pullToRefreshEnabled;
1157
     _pullToRefreshEnabled = pullToRefreshEnabled;

+ 1
- 1
package.json 查看文件

8
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
8
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
9
   ],
9
   ],
10
   "license": "MIT",
10
   "license": "MIT",
11
-  "version": "10.9.1",
11
+  "version": "10.9.2",
12
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
12
   "homepage": "https://github.com/react-native-community/react-native-webview#readme",
13
   "scripts": {
13
   "scripts": {
14
     "start": "node node_modules/react-native/local-cli/cli.js start",
14
     "start": "node node_modules/react-native/local-cli/cli.js start",

+ 1
- 1
react-native-webview.podspec 查看文件

10
 
10
 
11
   s.authors      = package['author']
11
   s.authors      = package['author']
12
   s.homepage     = package['homepage']
12
   s.homepage     = package['homepage']
13
-  s.platforms    = { :ios => "9.0", :osx => "10.14" }
13
+  s.platforms    = { :ios => "9.0", :osx => "10.13" }
14
 
14
 
15
   s.source       = { :git => "https://github.com/react-native-community/react-native-webview.git", :tag => "v#{s.version}" }
15
   s.source       = { :git => "https://github.com/react-native-community/react-native-webview.git", :tag => "v#{s.version}" }
16
   s.source_files  = "apple/**/*.{h,m}"
16
   s.source_files  = "apple/**/*.{h,m}"