From 96e9ad9aec33c79fcabc1fece3caa5212faf76a4 Mon Sep 17 00:00:00 2001 From: Andrei Coman Date: Thu, 9 Apr 2015 16:20:59 -0700 Subject: [PATCH] [react_native] JS files from D1980312: [react_native] Fix webview --- Libraries/Components/WebView/WebView.android.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js index 82d6f427c..bfc823f9f 100644 --- a/Libraries/Components/WebView/WebView.android.js +++ b/Libraries/Components/WebView/WebView.android.js @@ -34,8 +34,8 @@ var WebViewState = keyMirror({ var WebView = React.createClass({ propTypes: { - renderError: PropTypes.func.isRequired, // view to show if there's an error - renderLoading: PropTypes.func.isRequired, // loading indicator to show + renderError: PropTypes.func, // view to show if there's an error + renderLoading: PropTypes.func, // loading indicator to show url: PropTypes.string.isRequired, automaticallyAdjustContentInsets: PropTypes.bool, contentInset: EdgeInsetsPropType, @@ -66,10 +66,10 @@ var WebView = React.createClass({ var otherView = null; if (this.state.viewState === WebViewState.LOADING) { - otherView = this.props.renderLoading(); + otherView = this.props.renderLoading && this.props.renderLoading(); } else if (this.state.viewState === WebViewState.ERROR) { var errorEvent = this.state.lastErrorEvent; - otherView = this.props.renderError( + otherView = this.props.renderError && this.props.renderError( errorEvent.domain, errorEvent.code, errorEvent.description);