Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
chore(deps): update React Native to 0.32.0
  • Loading branch information
marclaval committed Sep 1, 2016
commit 50f4b884690189c42f567e65badd689134ff7f25
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@angular/platform-server": "v2.0.0-rc.5",
"@angular/router-deprecated": "v2.0.0-rc.2",
"hammerjs": "2.0.6",
"react-native": "0.31.0",
"react-native": "0.32.0",
"reflect-metadata": "0.1.8",
"rxjs": "5.0.0-beta.6",
"zone.js": "mlaval/zone.js#prerelease0.6.13"
Expand Down
8 changes: 5 additions & 3 deletions src/components/activity_indicator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class ActivityIndicator extends HighLevelComponent {
private _animating: boolean = true;
private _color: number;
private _hidesWhenStopped: boolean = true;
private _size: string;
private _size: string | number;
/**
* To be documented
*/
Expand All @@ -51,12 +51,14 @@ export class ActivityIndicator extends HighLevelComponent {
* To be documented
* @platform ios
*/
set size(value: string) {
set size(value: string | number) {
this._size = this.processEnum(value, ['small', 'large']);
if (this._size == 'small') {
this.setDefaultStyle({height: 20, width: 20});
} else {
} else if (this._size == 'large') {
this.setDefaultStyle({height: 36, width: 36});
} else {
this.setDefaultStyle({height: this._size, width: this._size});
}
}
}
2 changes: 1 addition & 1 deletion src/components/image.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var IOS_INPUTS: Array<string> = ['blurRadius', 'capInsets', 'defaultSource'];

var ANDROID_BINDINGS: string = `[fadeDuration]="_fadeDuration" [loadingIndicatorSrc]="_loadingIndicatorSrc ? _loadingIndicatorSrc.uri : null"
[progressiveRenderingEnabled]="_progressiveRenderingEnabled" [shouldNotifyLoadEvents]="_shouldNotifyLoadEvents" [src]="_source ? [{uri: _source.uri}] : null"`;
var IOS_BINDINGS: string = `[blurRadius]="_blurRadius" [capInsets]="_capInsets" [defaultSource]="_defaultSource" [source]="_source"`;
var IOS_BINDINGS: string = `[blurRadius]="_blurRadius" [capInsets]="_capInsets" [defaultSource]="_defaultSource" [source]="[_source]"`;

//TODO: add iOS specific events (onError, on Progress) and specific cases (tintColor, resizeMode)
/**
Expand Down
11 changes: 9 additions & 2 deletions src/components/textinput.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import {ReactNativeWrapper, isAndroid} from "./../wrapper/wrapper";
import {HighLevelComponent, GENERIC_INPUTS, GENERIC_BINDINGS} from "./component";

var ANDROID_INPUTS: Array<string> = ['numberOfLines', 'returnKeyLabel', 'underlineColorAndroid'];
var IOS_INPUTS: Array<string> = ['clearButtonMode', 'clearTextOnFocus', 'enablesReturnKeyAutomatically',
'keyboardAppearance'];
var IOS_INPUTS: Array<string> = ['clearButtonMode', 'clearTextOnFocus', 'dataDetectorTypes',
'enablesReturnKeyAutomatically', 'keyboardAppearance'];

var ANDROID_BINDINGS: string = `[numberOfLines]="_numberOfLines" [underlineColorAndroid]="_underlineColorAndroid"
[returnKeyLabel]="_returnKeyLabel" (topTextInput)="_handleKeyPress($event)"
mostRecentEventCount="0"`;
var IOS_BINDINGS: string = `[clearButtonMode]="_clearButtonMode" [clearTextOnFocus]="_clearTextOnFocus"
[dataDetectorTypes]="_dataDetectorTypes"
[enablesReturnKeyAutomatically]="_enablesReturnKeyAutomatically" [keyboardAppearance]="_keyboardAppearance"
(topKeyPress)="_handleKeyPress($event)"`;

Expand Down Expand Up @@ -196,6 +197,7 @@ export class TextInput extends HighLevelComponent implements OnInit {

private _clearButtonMode: boolean;
private _clearTextOnFocus: boolean;
private _dataDetectorTypes: string;
private _enablesReturnKeyAutomatically: boolean;
private _keyboardAppearance: string;
/**
Expand All @@ -208,6 +210,11 @@ export class TextInput extends HighLevelComponent implements OnInit {
* @platform ios
*/
set clearTextOnFocus(value: any) {this._clearTextOnFocus = this.processBoolean(value);}
/**
* To be documented
* @platform ios
*/
set dataDetectorTypes(value: string) {this._dataDetectorTypes = this.processEnum(value, ['phoneNumber', 'link', 'address', 'calendarEvent', 'none', 'all']);}
/**
* To be documented
* @platform ios
Expand Down