kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-05-10 01:15:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updates from Tue 17 Mar

Browse Source 
- [ReactNative] Remove pushNotification prop from renderApplication | Eric Vicenti
- [react_native] Stub VibrationIOS on Android | Andy Street
- [ReactNative] Simplify and test interpolators | Christopher Chedeau
- [ReactNative] Increase timeout for obj-c tests | Christopher Chedeau
- [ReactNative] Updated RKText to new UIManager system | Nick Lockwood
- [ReactNative] Unforked RCTShadowView, moved RKTextView into FBReactKitTextModule | Nick Lockwood
- [ReactKit] Remove NativeModulesDeprecated | Spencer Ahrens
- [ReactNative] Allow single callbacks in NativeModules | Spencer Ahrens
- [ReactNative] s/RK/RCT in OSS | Spencer Ahrens
- [ReactNative] Cleanup StyleSheet API | Christopher Chedeau
- [RCTVibration] Basic Vibration API | Christopher Chedeau
- [React Native] Prevent crash in redbox code with two thrown errors | Ben Alpert
- [ReactNative] unbreak Android | Andrew Rasmussen
This commit is contained in:
Christopher Chedeau
2015-03-17 13:42:44 -07:00
parent 299dea8594
commit f7cf017d29
77 changed files with 937 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Libraries/Components/TextInput/TextInput.ios.js
View File

@@ -8,7 +8,7 @@
var DocumentSelectionState = require('DocumentSelectionState');
var EventEmitter = require('EventEmitter');
var NativeMethodsMixin = require('NativeMethodsMixin');
var RKUIManager = require('NativeModules').RKUIManager;
var RCTUIManager = require('NativeModules').RCTUIManager;
var PropTypes = require('ReactPropTypes');
var React = require('React');
var ReactChildren = require('ReactChildren');
@@ -25,10 +25,10 @@ var getObjectValues = require('getObjectValues');
var invariant = require('invariant');
var merge = require('merge');
var autoCapitalizeConsts = RKUIManager.UIText.AutocapitalizationType;
var clearButtonModeConsts = RKUIManager.UITextField.clearButtonMode;
var autoCapitalizeConsts = RCTUIManager.UIText.AutocapitalizationType;
var clearButtonModeConsts = RCTUIManager.UITextField.clearButtonMode;
var RKTextViewAttributes = merge(ReactIOSViewAttributes.UIView, {
var RCTTextViewAttributes = merge(ReactIOSViewAttributes.UIView, {
autoCorrect: true,
autoCapitalize: true,
color: true,
@@ -42,7 +42,7 @@ var RKTextViewAttributes = merge(ReactIOSViewAttributes.UIView, {
text: true,
});
var RKTextFieldAttributes = merge(RKTextViewAttributes, {
var RCTTextFieldAttributes = merge(RCTTextViewAttributes, {
caretHidden: true,
enabled: true,
clearButtonMode: true,
@@ -198,7 +198,7 @@ var TextInput = React.createClass({
viewConfig: {
uiViewClassName: 'RCTTextField',
validAttributes: RKTextFieldAttributes,
validAttributes: RCTTextFieldAttributes,
},
isFocused: function() {
@@ -309,7 +309,7 @@ var TextInput = React.createClass({
}
}
textContainer =
<RKTextField
<RCTTextField
ref="input"
style={[styles.input, this.props.style]}
enabled={this.props.editable}
@@ -349,7 +349,7 @@ var TextInput = React.createClass({
children = [children, this.props.inputView];
}
textContainer =
<RKTextView
<RCTTextView
ref="input"
style={[styles.input, this.props.style]}
children={children}
@@ -428,13 +428,13 @@ var styles = StyleSheet.create({
},
});
var RKTextView = createReactIOSNativeComponentClass({
validAttributes: RKTextViewAttributes,
var RCTTextView = createReactIOSNativeComponentClass({
validAttributes: RCTTextViewAttributes,
uiViewClassName: 'RCTTextView',
});
var RKTextField = createReactIOSNativeComponentClass({
validAttributes: RKTextFieldAttributes,
var RCTTextField = createReactIOSNativeComponentClass({
validAttributes: RCTTextFieldAttributes,
uiViewClassName: 'RCTTextField',
});