From 8a0d98e81571042efec5e321a2d1c0e4effe5cf0 Mon Sep 17 00:00:00 2001 From: vakrilov Date: Tue, 21 Feb 2017 17:35:40 +0200 Subject: [PATCH] Inset clip path + Background circ-ref --- tns-core-modules/ui/core/view-common.ts | 2 +- tns-core-modules/ui/styling/background-common.ts | 1 - tns-core-modules/ui/styling/background.android.ts | 2 +- tns-core-modules/ui/styling/background.ios.ts | 4 +++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tns-core-modules/ui/core/view-common.ts b/tns-core-modules/ui/core/view-common.ts index 6bd6d2b21..271abf137 100644 --- a/tns-core-modules/ui/core/view-common.ts +++ b/tns-core-modules/ui/core/view-common.ts @@ -1898,7 +1898,7 @@ function isNonNegativeFiniteNumber(value: number): boolean { return isFinite(value) && !isNaN(value) && value >= 0; } -let supportedPaths = ["rect", "circle", "ellipse", "polygon"]; +let supportedPaths = ["rect", "circle", "ellipse", "polygon", "inset"]; function isClipPathValid(value: string): boolean { if (!value) { return true; diff --git a/tns-core-modules/ui/styling/background-common.ts b/tns-core-modules/ui/styling/background-common.ts index 0e9bc44fa..73b726386 100644 --- a/tns-core-modules/ui/styling/background-common.ts +++ b/tns-core-modules/ui/styling/background-common.ts @@ -2,7 +2,6 @@ import { Background as BackgroundDefinition, BackgroundDrawParams } from "ui/sty import { Color, BackgroundRepeat } from "ui/core/view"; import { ImageSource } from "image-source"; import { CSSValue, parse as cssParse } from "css-value"; -export * from "ui/core/view"; export class Background implements BackgroundDefinition { public static default = new Background(); diff --git a/tns-core-modules/ui/styling/background.android.ts b/tns-core-modules/ui/styling/background.android.ts index d0d971393..90743cc9c 100644 --- a/tns-core-modules/ui/styling/background.android.ts +++ b/tns-core-modules/ui/styling/background.android.ts @@ -1,4 +1,4 @@ -import { View } from "./background-common"; +import { View } from "ui/core/view"; import { isNullOrUndefined, isFunction, getClass } from "utils/types"; import { CacheLayerType, layout } from "utils/utils"; import { parse } from "css-value"; diff --git a/tns-core-modules/ui/styling/background.ios.ts b/tns-core-modules/ui/styling/background.ios.ts index 07c8ccae0..471b23045 100644 --- a/tns-core-modules/ui/styling/background.ios.ts +++ b/tns-core-modules/ui/styling/background.ios.ts @@ -1,5 +1,7 @@ -import { Background, View, Point, layout, Color } from "./background-common"; +import { View, Color, Point } from "ui/core/view"; +import { Background } from "./background-common"; import { ios as utilsIos } from "utils/utils"; +import { layout } from "utils/utils"; export * from "./background-common";