Merge branch 'agenthunt-master' into develop

alinz · alinz · commit cb1cf08923a8 · 2016-03-01T22:07:52.000-05:00
diff --git a/examples/SampleRN20/app.js b/examples/SampleRN20/app.js
@@ -44,14 +44,29 @@ var Sample2 = React.createClass({
   },
   render: function() {
     return (
+      <View style={styles.container}>
       <WebViewBridge
         ref="webviewbridge"
         onBridgeMessage={this.onBridgeMessage}
         javaScriptEnabled={true}
         injectedJavaScript={injectScript}
         source={{uri: "https://google.com"}}/>
+        <WebViewBridge
+        ref="webviewbridge2"
+        onBridgeMessage={this.onBridgeMessage}
+        javaScriptEnabled={true}
+        injectedJavaScript={injectScript}
+        source={require('./test.html')}/>
+        </View>
     );
   }
 });
 
 module.exports = Sample2;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1
+  }
+});
+
diff --git a/examples/SampleRN20/test.html b/examples/SampleRN20/test.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title></title>
+</head>
+<body>
+Hello test html
+</body>
+</html>
diff --git a/webview-bridge/index.android.js b/webview-bridge/index.android.js
@@ -17,7 +17,7 @@ var React = require('react-native');
 var invariant = require('invariant');
 var keyMirror = require('keymirror');
 var merge = require('merge');
-import resolveAssetSource from 'resolveAssetSource';
+var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
 
 var {
   ReactNativeViewAttributes,
@@ -112,9 +112,8 @@ var WebViewBridge = React.createClass({
     }
 
     let props = {...this.props};
-    const source = resolveAssetSource(props.source);
-    delete props.source;
-
+    props.source = resolveAssetSource(props.source);
+    
     var webView =
       <RCTWebViewBridge
         ref={RCT_WEBVIEWBRIDGE_REF}
diff --git a/webview-bridge/index.ios.js b/webview-bridge/index.ios.js
@@ -17,7 +17,7 @@
 var React = require('react-native');
 var invariant = require('invariant');
 var keyMirror = require('keymirror');
-import resolveAssetSource from 'resolveAssetSource';
+var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
 
 var {
   ActivityIndicatorIOS,
@@ -176,11 +176,12 @@ var WebViewBridge = React.createClass({
     };
 
     let props = {...this.props};
-    const source = resolveAssetSource(props.source);
     delete props.onBridgeMessage;
     delete props.onShouldStartLoadWithRequest;
     delete props.source;
 
+    props.source = resolveAssetSource(props.source);
+
     var webView =
       <RCTWebViewBridge
         ref={RCT_WEBVIEWBRIDGE_REF}
