Skip to content

Commit d06e80d

Browse files
author
Ali Najafizadeh
committed
Merge pull request #87 from dozoisch/master
Updated files for react-native 0.25
2 parents 1e4846f + f1d6ebe commit d06e80d

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

webview-bridge/index.android.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
*/
1414
'use strict';
1515

16-
var React = require('react-native');
16+
var React = require('react');
17+
var ReactNative = require('react-native');
1718
var invariant = require('invariant');
1819
var keyMirror = require('keymirror');
1920
var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
@@ -27,12 +28,12 @@ var {
2728
View,
2829
WebView,
2930
requireNativeComponent,
30-
PropTypes,
3131
DeviceEventEmitter,
3232
NativeModules: {
3333
WebViewBridgeManager
3434
}
35-
} = React;
35+
} = ReactNative;
36+
var { PropTypes } = React;
3637

3738
var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge';
3839

@@ -183,7 +184,7 @@ var WebViewBridge = React.createClass({
183184
},
184185

185186
getWebViewBridgeHandle: function() {
186-
return React.findNodeHandle(this.refs[RCT_WEBVIEWBRIDGE_REF]);
187+
return ReactNative.findNodeHandle(this.refs[RCT_WEBVIEWBRIDGE_REF]);
187188
},
188189

189190
onLoadingStart: function(event) {

webview-bridge/index.ios.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
*/
1515
'use strict';
1616

17-
var React = require('react-native');
17+
var React = require('react');
18+
var ReactNative = require('react-native');
1819
var invariant = require('invariant');
1920
var keyMirror = require('keymirror');
2021
var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
@@ -27,12 +28,12 @@ var {
2728
View,
2829
WebView,
2930
requireNativeComponent,
30-
PropTypes,
3131
UIManager,
3232
NativeModules: {
3333
WebViewBridgeManager
3434
}
35-
} = React;
35+
} = ReactNative;
36+
var { PropTypes } = React;
3637

3738
var BGWASH = 'rgba(255,255,255,0.8)';
3839
var RCT_WEBVIEWBRIDGE_REF = 'webviewbridge';
@@ -240,7 +241,7 @@ var WebViewBridge = React.createClass({
240241
},
241242

242243
getWebViewBridgeHandle: function(): any {
243-
return React.findNodeHandle(this.refs[RCT_WEBVIEWBRIDGE_REF]);
244+
return ReactNative.findNodeHandle(this.refs[RCT_WEBVIEWBRIDGE_REF]);
244245
},
245246

246247
onLoadingStart: function(event: Event) {

0 commit comments

Comments
 (0)