Merge branch 'release/v0.20.1'

Author: alinz

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-webview-bridge",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "React Native WebView Javascript Bridge",
   "main": "webview-bridge",
   "directories": {

webview-bridge/index.android.js

@@ -17,6 +17,7 @@ var React = require('react-native');
 var invariant = require('invariant');
 var keyMirror = require('keymirror');
 var merge = require('merge');
+import resolveAssetSource from 'resolveAssetSource';
 
 var {
   ReactNativeViewAttributes,
@@ -110,11 +111,15 @@ var WebViewBridge = React.createClass({
       domStorageEnabled = this.props.domStorageEnabledAndroid;
     }
 
+    let props = {...this.props};
+    const source = resolveAssetSource(props.source);
+    delete props.source;
+
     var webView =
       <RCTWebViewBridge
         ref={RCT_WEBVIEWBRIDGE_REF}
         key="webViewKey"
-        {...this.props}
+        {...props}
         style={webViewStyles}
         onLoadingStart={this.onLoadingStart}
         onLoadingFinish={this.onLoadingFinish}

webview-bridge/index.ios.js

@@ -17,6 +17,7 @@
 var React = require('react-native');
 var invariant = require('invariant');
 var keyMirror = require('keymirror');
+import resolveAssetSource from 'resolveAssetSource';
 
 var {
   ActivityIndicatorIOS,
@@ -174,15 +175,18 @@ var WebViewBridge = React.createClass({
       }
     };
 
-    const props = {...this.props};
+    let props = {...this.props};
+    const source = resolveAssetSource(props.source);
     delete props.onBridgeMessage;
     delete props.onShouldStartLoadWithRequest;
+    delete props.source;
 
     var webView =
       <RCTWebViewBridge
         ref={RCT_WEBVIEWBRIDGE_REF}
         key="webViewKey"
         {...props}
+        source={source}
         style={webViewStyles}
         onLoadingStart={this.onLoadingStart}
         onLoadingFinish={this.onLoadingFinish}