diff --git a/apps/app/package.json b/apps/app/package.json index b83961d5d..711929cac 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -1,4 +1,4 @@ { "name": "tns-samples-apps", - "main": "cuteness.io/app.js" + "main": "ui-tests-app/app.js" } diff --git a/tns-core-modules/ui/definitions.d.ts b/tns-core-modules/ui/definitions.d.ts index 73b6ce3d8..fef79ae0c 100644 --- a/tns-core-modules/ui/definitions.d.ts +++ b/tns-core-modules/ui/definitions.d.ts @@ -256,6 +256,7 @@ declare module "ui/core/properties" { export function applyNativeSetters(view: ViewBase): void; export function resetStyleProperties(style: Style): void; + export function resetCSSProperties(style: Style): void; export function makeValidator(...values: T[]): (value: any) => value is T; export function makeParser(isValid: (value: any) => boolean, def: T): (value: any) => T; diff --git a/tns-core-modules/ui/page/page-common.ts b/tns-core-modules/ui/page/page-common.ts index db9e3d79c..9f47133f5 100644 --- a/tns-core-modules/ui/page/page-common.ts +++ b/tns-core-modules/ui/page/page-common.ts @@ -1,7 +1,7 @@ import { Page as PageDefinition, NavigatedData, ShownModallyData } from "ui/page"; import { ContentView, View, backgroundColorProperty, - eachDescendant, Property, Color, isIOS, booleanConverter, resetStyleProperties + eachDescendant, Property, Color, isIOS, booleanConverter, resetCSSProperties } from "ui/content-view"; import { Frame, topmost as topmostFrame, resolvePageFromEntry } from "ui/frame"; import { ActionBar } from "ui/action-bar"; @@ -282,7 +282,7 @@ export class PageBase extends ContentView implements PageDefinition { private _resetCssValues() { const resetCssValuesFunc = (view: View): boolean => { view._cancelAllAnimations(); - resetStyleProperties(view.style); + resetCSSProperties(view.style); return true; };