mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
Upgrade to TypeScript 2.1, and latest grunt-ts.
Conflicts: package.json tests/app/ui/animation/animation-tests.ts tns-core-modules/lib.core.d.ts tns-core-modules/ui/animation/animation-common.ts
This commit is contained in:
@@ -5,6 +5,7 @@ import {Label} from "ui/label";
|
||||
import {StackLayout} from "ui/layouts/stack-layout";
|
||||
import * as colorModule from "color";
|
||||
import * as enums from "ui/enums";
|
||||
import { AnimationPromise } from "ui/animation";
|
||||
|
||||
// >> animation-require
|
||||
import * as animation from "ui/animation";
|
||||
@@ -105,7 +106,7 @@ export function test_CancellingAnimate(done) {
|
||||
}
|
||||
// << (hide)
|
||||
});
|
||||
animation1.cancel();
|
||||
(<AnimationPromise>animation1).cancel();
|
||||
// << animation-cancel2
|
||||
}
|
||||
|
||||
@@ -484,4 +485,4 @@ function assertIOSNativeTransformIsCorrect(view: viewModule.View) {
|
||||
TKUnit.assert(false, errorMessage);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
3
tests/references.d.ts
vendored
3
tests/references.d.ts
vendored
@@ -2,7 +2,4 @@
|
||||
/// <reference path="../tns-platform-declarations/ios.d.ts" />
|
||||
|
||||
/// <reference path="../tns-core-modules/tns-core-modules.d.ts" />
|
||||
/// <reference path="../tns-core-modules/lib.core.d.ts" />
|
||||
/// <reference path="../tns-core-modules/lib.dom.d.ts" />
|
||||
|
||||
/// <reference path="../tns-core-modules/ui/styling/css-selector-parser.d.ts" />
|
||||
|
||||
Reference in New Issue
Block a user