Stop using platform-specific names for props

odino · facebook-github-bot-0 · commit 6edcebef9c2a · 2016-01-05T10:32:43.000-08:00
Summary: Follows up on [this comment](facebook/react-native#5065 (comment)) by nicklockwood in #5065. Rely on using the platform annotation and keep the API / naming less redundant. Closes facebook/react-native#5081 Reviewed By: svcscm Differential Revision: D2803143 Pulled By: nicklockwood fb-gh-sync-id: 9bdf028f5022ef46fcb63aa6c3fc931fdcc46f2b
diff --git a/Examples/UIExplorer/WebViewExample.js b/Examples/UIExplorer/WebViewExample.js
@@ -94,8 +94,8 @@ var WebViewExample = React.createClass({
           automaticallyAdjustContentInsets={false}
           style={styles.webView}
           url={this.state.url}
-          javaScriptEnabledAndroid={true}
-          domStorageEnabledAndroid={true}
+          javaScriptEnabled={true}
+          domStorageEnabled={true}
           onNavigationStateChange={this.onNavigationStateChange}
           onShouldStartLoadWithRequest={this.onShouldStartLoadWithRequest}
           startInLoadingState={true}
diff --git a/Libraries/Components/WebView/WebView.android.js b/Libraries/Components/WebView/WebView.android.js
@@ -52,13 +52,13 @@ var WebView = React.createClass({
      * Used on Android only, JS is enabled by default for WebView on iOS
      * @platform android
      */
-    javaScriptEnabledAndroid: PropTypes.bool,
+    javaScriptEnabled: PropTypes.bool,
 
     /**
      * Used on Android only, controls whether DOM Storage is enabled or not
      * @platform android
      */
-    domStorageEnabledAndroid: PropTypes.bool,
+    domStorageEnabled: PropTypes.bool,
 
     /**
      * Sets the JS to be injected when the webpage loads.
@@ -113,6 +113,16 @@ var WebView = React.createClass({
       webViewStyles.push(styles.hidden);
     }
 
+    var {javaScriptEnabled, domStorageEnabled} = this.props;
+    if (this.props.javaScriptEnabledAndroid) {
+      console.warn('javaScriptEnabledAndroid is deprecated. Use javaScriptEnabled instead');
+      javaScriptEnabled = this.props.javaScriptEnabledAndroid;
+    }
+    if (this.props.domStorageEnabledAndroid) {
+      console.warn('domStorageEnabledAndroid is deprecated. Use domStorageEnabled instead');
+      domStorageEnabled = this.props.domStorageEnabledAndroid;
+    }
+
     var webView =
       <RCTWebView
         ref={RCT_WEBVIEW_REF}
@@ -122,8 +132,8 @@ var WebView = React.createClass({
         html={this.props.html}
         injectedJavaScript={this.props.injectedJavaScript}
         userAgent={this.props.userAgent}
-        javaScriptEnabledAndroid={this.props.javaScriptEnabledAndroid}
-        domStorageEnabledAndroid={this.props.domStorageEnabledAndroid}
+        javaScriptEnabled={javaScriptEnabled}
+        domStorageEnabled={domStorageEnabled}
         contentInset={this.props.contentInset}
         automaticallyAdjustContentInsets={this.props.automaticallyAdjustContentInsets}
         onLoadingStart={this.onLoadingStart}
diff --git a/Libraries/Components/WebView/WebView.ios.js b/Libraries/Components/WebView/WebView.ios.js
@@ -114,13 +114,13 @@ var WebView = React.createClass({
      * Used on Android only, JS is enabled by default for WebView on iOS
      * @platform android
      */
-    javaScriptEnabledAndroid: PropTypes.bool,
+    javaScriptEnabled: PropTypes.bool,
 
     /**
      * Used on Android only, controls whether DOM Storage is enabled or not
      * @platform android
      */
-    domStorageEnabledAndroid: PropTypes.bool,
+    domStorageEnabled: PropTypes.bool,
 
     /**
      * Sets the JS to be injected when the webpage loads.
@@ -201,6 +201,16 @@ var WebView = React.createClass({
       RCTWebViewManager.startLoadWithResult(!!shouldStart, event.nativeEvent.lockIdentifier);
     });
 
+    var {javaScriptEnabled, domStorageEnabled} = this.props;
+    if (this.props.javaScriptEnabledAndroid) {
+      console.warn('javaScriptEnabledAndroid is deprecated. Use javaScriptEnabled instead');
+      javaScriptEnabled = this.props.javaScriptEnabledAndroid;
+    }
+    if (this.props.domStorageEnabledAndroid) {
+      console.warn('domStorageEnabledAndroid is deprecated. Use domStorageEnabled instead');
+      domStorageEnabled = this.props.domStorageEnabledAndroid;
+    }
+
     var webView =
       <RCTWebView
         ref={RCT_WEBVIEW_REF}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/webview/ReactWebViewManager.java
@@ -251,12 +251,12 @@ protected WebView createViewInstance(ThemedReactContext reactContext) {
     return webView;
   }
 
-  @ReactProp(name = "javaScriptEnabledAndroid")
+  @ReactProp(name = "javaScriptEnabled")
   public void setJavaScriptEnabled(WebView view, boolean enabled) {
     view.getSettings().setJavaScriptEnabled(enabled);
   }
 
-  @ReactProp(name = "domStorageEnabledAndroid")
+  @ReactProp(name = "domStorageEnabled")
   public void setDomStorageEnabled(WebView view, boolean enabled) {
     view.getSettings().setDomStorageEnabled(enabled);
   }

Original file line number	Diff line number	Diff line change
`@@ -251,12 +251,12 @@ protected WebView createViewInstance(ThemedReactContext reactContext) {`
`251`	`251`	`return webView;`
`252`	`252`	`}`
`253`	`253`
`254`		`- @ReactProp(name = "javaScriptEnabledAndroid")`
	`254`	`+ @ReactProp(name = "javaScriptEnabled")`
`255`	`255`	`public void setJavaScriptEnabled(WebView view, boolean enabled) {`
`256`	`256`	`view.getSettings().setJavaScriptEnabled(enabled);`
`257`	`257`	`}`
`258`	`258`
`259`		`- @ReactProp(name = "domStorageEnabledAndroid")`
	`259`	`+ @ReactProp(name = "domStorageEnabled")`
`260`	`260`	`public void setDomStorageEnabled(WebView view, boolean enabled) {`
`261`	`261`	`view.getSettings().setDomStorageEnabled(enabled);`
`262`	`262`	`}`