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

Call resetCSSProperties instead of resetStyleProperties from _resetCssValues

Browse Source
This commit is contained in:
Rossen Hristov
2017-01-06 14:06:32 +02:00
parent eb4ac8d109
commit a2d2f65adc
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/package.json
View File

@ -1,4 +1,4 @@
{ {
"name": "tns-samples-apps", "name": "tns-samples-apps",
"main": "cuteness.io/app.js" "main": "ui-tests-app/app.js"
} }

1
tns-core-modules/ui/definitions.d.ts vendored
View File

@ -256,6 +256,7 @@ declare module "ui/core/properties" {
export function applyNativeSetters(view: ViewBase): void; export function applyNativeSetters(view: ViewBase): void;
export function resetStyleProperties(style: Style): void; export function resetStyleProperties(style: Style): void;
export function resetCSSProperties(style: Style): void;
export function makeValidator<T>(...values: T[]): (value: any) => value is T; export function makeValidator<T>(...values: T[]): (value: any) => value is T;
export function makeParser<T>(isValid: (value: any) => boolean, def: T): (value: any) => T; export function makeParser<T>(isValid: (value: any) => boolean, def: T): (value: any) => T;

4
tns-core-modules/ui/page/page-common.ts
View File

@ -1,7 +1,7 @@
import { Page as PageDefinition, NavigatedData, ShownModallyData } from "ui/page"; import { Page as PageDefinition, NavigatedData, ShownModallyData } from "ui/page";
import { import {
ContentView, View, backgroundColorProperty, ContentView, View, backgroundColorProperty,
eachDescendant, Property, Color, isIOS, booleanConverter, resetStyleProperties eachDescendant, Property, Color, isIOS, booleanConverter, resetCSSProperties
} from "ui/content-view"; } from "ui/content-view";
import { Frame, topmost as topmostFrame, resolvePageFromEntry } from "ui/frame"; import { Frame, topmost as topmostFrame, resolvePageFromEntry } from "ui/frame";
import { ActionBar } from "ui/action-bar"; import { ActionBar } from "ui/action-bar";
@ -282,7 +282,7 @@ export class PageBase extends ContentView implements PageDefinition {
private _resetCssValues() { private _resetCssValues() {
const resetCssValuesFunc = (view: View): boolean => { const resetCssValuesFunc = (view: View): boolean => {
view._cancelAllAnimations(); view._cancelAllAnimations();
resetStyleProperties(view.style); resetCSSProperties(view.style);
return true; return true;
}; };