status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[react_native] JS files from D1980312: [react_native] Fix webview

This commit is contained in:
Andrei Coman 2015-04-09 16:20:59 -07:00
parent 21f45e8899
commit 96e9ad9aec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Libraries/Components/WebView/WebView.android.js
View File

@ -34,8 +34,8 @@ var WebViewState = keyMirror({
var WebView = React.createClass({ var WebView = React.createClass({
propTypes: { propTypes: {
renderError: PropTypes.func.isRequired, // view to show if there's an error renderError: PropTypes.func, // view to show if there's an error
renderLoading: PropTypes.func.isRequired, // loading indicator to show renderLoading: PropTypes.func, // loading indicator to show
url: PropTypes.string.isRequired, url: PropTypes.string.isRequired,
automaticallyAdjustContentInsets: PropTypes.bool, automaticallyAdjustContentInsets: PropTypes.bool,
contentInset: EdgeInsetsPropType, contentInset: EdgeInsetsPropType,
@ -66,10 +66,10 @@ var WebView = React.createClass({
var otherView = null; var otherView = null;
if (this.state.viewState === WebViewState.LOADING) { if (this.state.viewState === WebViewState.LOADING) {
otherView = this.props.renderLoading(); otherView = this.props.renderLoading && this.props.renderLoading();
} else if (this.state.viewState === WebViewState.ERROR) { } else if (this.state.viewState === WebViewState.ERROR) {
var errorEvent = this.state.lastErrorEvent; var errorEvent = this.state.lastErrorEvent;
otherView = this.props.renderError( otherView = this.props.renderError && this.props.renderError(
errorEvent.domain, errorEvent.domain,
errorEvent.code, errorEvent.code,
errorEvent.description); errorEvent.description);