javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #333 from NativeScript/collapsed-changed

Browse Source 
Collapse property added. Collapsed property is now obsolete.
This commit is contained in:
Vladimir Enchev
2015-06-16 16:08:17 +03:00
parent 9a8fdbc6f5 d7fd672ad6
commit 1a9c7af8b0
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ui/enums/enums.d.ts vendored
View File

@ -191,9 +191,14 @@
export var visible: string; export var visible: string;
/** /**
* The view is not visible and won't take place in the layout. * Obsolete. Please use 'collapse' instead!
*/ */
export var collapsed: string; export var collapsed: string;
/**
* The view is not visible and won't take place in the layout.
*/
export var collapse: string;
} }
/** /**

1
ui/enums/enums.ts
View File

@ -48,6 +48,7 @@ export module Stretch {
export module Visibility { export module Visibility {
export var visible: string = "visible"; export var visible: string = "visible";
export var collapse: string = "collapse";
export var collapsed: string = "collapsed"; export var collapsed: string = "collapsed";
} }

2
ui/styling/converters.ts
View File

@ -29,6 +29,8 @@ export var numberConverter = parseFloat;
export function visibilityConverter(value: string): string { export function visibilityConverter(value: string): string {
if (value.toLowerCase() === enums.Visibility.collapsed) { if (value.toLowerCase() === enums.Visibility.collapsed) {
return enums.Visibility.collapsed; return enums.Visibility.collapsed;
} else if (value.toLowerCase() === enums.Visibility.collapse) {
return enums.Visibility.collapse;
} }
return enums.Visibility.visible; return enums.Visibility.visible;
} }

4
ui/styling/style.ts
View File

@ -504,11 +504,11 @@ export var paddingBottomProperty = new styleProperty.Property("paddingBottom", "
new observable.PropertyMetadata(0, observable.PropertyMetadataSettings.AffectsLayout, null, isPaddingValid), converters.numberConverter); new observable.PropertyMetadata(0, observable.PropertyMetadataSettings.AffectsLayout, null, isPaddingValid), converters.numberConverter);
function isVisibilityValid(value: string): boolean { function isVisibilityValid(value: string): boolean {
return value === enums.Visibility.visible || value === enums.Visibility.collapsed; return value === enums.Visibility.visible || value === enums.Visibility.collapse || value === enums.Visibility.collapsed;
} }
function setLayoutInfoVisibility(data: observable.PropertyChangeData) { function setLayoutInfoVisibility(data: observable.PropertyChangeData) {
(<any>data.object)._view._isVisibleCache = data.newValue !== enums.Visibility.collapsed; (<any>data.object)._view._isVisibleCache = (data.newValue !== enums.Visibility.collapse || data.newValue !== enums.Visibility.collapsed);
} }
export var visibilityProperty = new styleProperty.Property("visibility", "visibility", export var visibilityProperty = new styleProperty.Property("visibility", "visibility",

2
ui/styling/stylers.android.ts
View File

@ -227,7 +227,7 @@ export class ActivityIndicatorStyler implements definition.stylers.Styler {
} }
public static setIndicatorVisibility(isBusy: boolean, visibility: string, nativeView: android.view.View) { public static setIndicatorVisibility(isBusy: boolean, visibility: string, nativeView: android.view.View) {
if (visibility === enums.Visibility.collapsed) { if (visibility === enums.Visibility.collapsed || visibility === enums.Visibility.collapse) {
nativeView.setVisibility(android.view.View.GONE); nativeView.setVisibility(android.view.View.GONE);
} }
else { else {