From a455fb9034d35edcae5f21108862cbf5bd7d6269 Mon Sep 17 00:00:00 2001
From: Will Piers <wpiers@rallydev.com>
Date: Thu, 2 Apr 2015 10:02:31 -0600
Subject: [PATCH] unify use of password and secureTextEntry for TextInput

---
 Examples/UIExplorer/TextInputExample.js     |  2 +-
 Libraries/Components/TextInput/TextInput.js | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Examples/UIExplorer/TextInputExample.js b/Examples/UIExplorer/TextInputExample.js
index 4e54c38b827a54..b033c7d3ba8025 100644
--- a/Examples/UIExplorer/TextInputExample.js
+++ b/Examples/UIExplorer/TextInputExample.js
@@ -251,7 +251,7 @@ exports.examples = [
       return (
         <View>
           <WithLabel label="true">
-            <TextInput secureTextEntry={true} style={styles.default} value="abc" />
+            <TextInput password={true} style={styles.default} value="abc" />
           </WithLabel>
         </View>
       );
diff --git a/Libraries/Components/TextInput/TextInput.js b/Libraries/Components/TextInput/TextInput.js
index 0b30fd7a572741..43e141bec57358 100644
--- a/Libraries/Components/TextInput/TextInput.js
+++ b/Libraries/Components/TextInput/TextInput.js
@@ -198,12 +198,6 @@ var TextInput = React.createClass({
      * automatically enables it when there is text. Default value is false.
      */
     enablesReturnKeyAutomatically: PropTypes.bool,
-
-    /**
-     * If true, the text input obscures the text entered so that sensitive text
-     * like passwords stay secure. Default value is false.
-     */
-    secureTextEntry: PropTypes.bool,
     /**
      * If true, the text input can be multiple lines. Default value is false.
      */
@@ -421,7 +415,7 @@ var TextInput = React.createClass({
           keyboardType={keyboardType}
           returnKeyType={returnKeyType}
           enablesReturnKeyAutomatically={this.props.enablesReturnKeyAutomatically}
-          secureTextEntry={this.props.secureTextEntry}
+          secureTextEntry={this.props.password || this.props.secureTextEntry}
           onFocus={this._onFocus}
           onBlur={this._onBlur}
           onChange={this._onChange}
@@ -466,7 +460,7 @@ var TextInput = React.createClass({
           keyboardType={keyboardType}
           returnKeyType={returnKeyType}
           enablesReturnKeyAutomatically={this.props.enablesReturnKeyAutomatically}
-          secureTextEntry={this.props.secureTextEntry}
+          secureTextEntry={this.props.password || this.props.secureTextEntry}
           onFocus={this._onFocus}
           onBlur={this._onBlur}
           onChange={this._onChange}
@@ -505,7 +499,7 @@ var TextInput = React.createClass({
         onFocus={this._onFocus}
         onBlur={this._onBlur}
         onChange={this._onChange}
-        password={this.props.password}
+        password={this.props.password || this.props.secureTextEntry}
         placeholder={this.props.placeholder}
         value={this.props.value}
         testID={this.props.testID}