javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ios-safe-area

Browse Source
This commit is contained in:
Martin Yankov
2018-09-10 16:13:25 +03:00
committed by GitHub
parent ce59a3d7a1 cca548d31a
commit 16a131f040
135 changed files with 159904 additions and 3995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/app/ui/view/view-tests-common.ts
View File

@@ -5,16 +5,15 @@ import { Page } from "tns-core-modules/ui/page";
import { Button } from "tns-core-modules/ui/button";
import { Label } from "tns-core-modules/ui/label";
import { Color } from "tns-core-modules/color";
import { Layout } from "tns-core-modules/ui/layouts/layout";
import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
import { AbsoluteLayout } from "tns-core-modules/ui/layouts/absolute-layout";
import * as utils from "tns-core-modules/utils/utils";
import * as types from "tns-core-modules/utils/types";
import * as helper from "../../ui/helper";
import * as observable from "tns-core-modules/data/observable";
import * as bindable from "tns-core-modules/ui/core/bindable";
import * as definition from "./view-tests";
import { isIOS, isAndroid } from "tns-core-modules/platform";
import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";
export function test_eachDescendant() {
const test = function (views: Array<View>) {
@@ -292,7 +291,7 @@ const customShortHandProperty = new ShorthandProperty<Style, string>({
});
customShortHandProperty.register(Style);
class TestView extends Layout {
class TestView extends LayoutBase {
public inheritanceTest: number;
public booleanInheritanceTest: boolean;
public dummy: number;