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 #366 from NativeScript/visibility-fix

Browse Source 
visibility fixed
This commit is contained in:
Vladimir Enchev
2015-06-29 11:33:19 +03:00
parent 76a1544822 a995b84119
commit 47c77e2a2b
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/tests/ui/view/view-tests-common.ts
View File

@ -13,6 +13,7 @@ import layoutModule = require("ui/layouts/layout");
import observable = require("data/observable");
import bindable = require("ui/core/bindable");
import definition = require("./view-tests");
import enums = require("ui/enums");
export var test_eachDescendant = function () {
var test = function (views: Array<viewModule.View>) {
@ -594,6 +595,23 @@ function _createLabelWithBorder(): viewModule.View {
return lbl;
}
export var testIsVisible = function () {
var lbl = new label.Label();
helper.buildUIAndRunTest(lbl, function (views: Array<viewModule.View>) {
TKUnit.assert(lbl.visibility === enums.Visibility.visible, "Actual: " + lbl.visibility + "; Expected: " + enums.Visibility.visible);
TKUnit.assert(lbl._isVisible, "Actual: " + lbl._isVisible + "; Expected: true;");
lbl.visibility = enums.Visibility.collapse;
TKUnit.assert(lbl.visibility === enums.Visibility.collapse, "Actual: " + lbl.visibility + "; Expected: " + enums.Visibility.collapse);
TKUnit.assert(!lbl._isVisible, "Actual: " + lbl._isVisible + "; Expected: false;");
lbl.visibility = enums.Visibility.collapsed;
TKUnit.assert(lbl.visibility === enums.Visibility.collapsed, "Actual: " + lbl.visibility + "; Expected: " + enums.Visibility.collapsed);
TKUnit.assert(!lbl._isVisible, "Actual: " + lbl._isVisible + "; Expected: false;");
});
}
export var testBorderWidth = function () {
helper.buildUIAndRunTest(_createLabelWithBorder(), function (views: Array<viewModule.View>) {
var lbl = <label.Label>views[0];

2
ui/styling/style.ts
View File

@ -671,7 +671,7 @@ function isVisibilityValid(value: string): boolean {
}
function setLayoutInfoVisibility(data: observable.PropertyChangeData) {
(<any>data.object)._view._isVisibleCache = (data.newValue !== enums.Visibility.collapse || data.newValue !== enums.Visibility.collapsed);
(<any>data.object)._view._isVisibleCache = (data.newValue === enums.Visibility.visible);
}
export var visibilityProperty = new styleProperty.Property("visibility", "visibility",