Skip to content

Commit 9619c5e

Browse files
author
vakrilov
committed
Update to 2.2.0
1 parent 3aac330 commit 9619c5e

File tree

8 files changed

+67
-52
lines changed

8 files changed

+67
-52
lines changed

Diff for: ‎nativescript-angular/animation-driver.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { AnimationPlayer, AnimationStyles, AnimationKeyframe } from "./private_import_core";
1+
import { AnimationPlayer } from "@angular/core";
2+
import { AnimationStyles, AnimationKeyframe } from "./private_import_core";
23
import { NativeScriptAnimationPlayer } from './animation-player';
34
import { View } from "ui/core/view";
45
import { getPropertyByCssName } from 'ui/styling/style-property';

Diff for: ‎nativescript-angular/animation-player.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { AnimationPlayer, AnimationKeyframe } from "./private_import_core";
1+
import { AnimationPlayer } from "@angular/core";
2+
import { AnimationKeyframe } from "./private_import_core";
23
import { KeyframeAnimation, KeyframeAnimationInfo, KeyframeInfo, KeyframeDeclaration } from 'ui/animation/keyframe-animation';
34
import { View } from "ui/core/view";
45
import { AnimationCurve } from "ui/enums";

Diff for: ‎nativescript-angular/dom-adapter.ts

+26-17
Original file line numberDiff line numberDiff line change
@@ -16,60 +16,69 @@ export enum SecurityContext {
1616

1717
export class NativeScriptElementSchemaRegistry extends ElementSchemaRegistry {
1818
hasProperty(tagName: string, propName: string): boolean {
19-
return true;
19+
return true;
2020
}
2121

2222
hasElement(tagName: string, schemaMetas: SchemaMetadata[]): boolean {
23-
return true;
23+
return true;
2424
}
2525

2626

2727
getMappedPropName(propName: string): string {
28-
return propName;
28+
return propName;
2929
}
3030

3131
getDefaultComponentElementName(): string {
32-
return 'ng-component';
32+
return 'ng-component';
3333
}
3434

3535
securityContext(tagName: string, propName: string): any {
36-
return SecurityContext.NONE;
36+
return SecurityContext.NONE;
3737
}
3838

39-
validateProperty(name: string): {error: boolean, msg?: string} {
40-
return {error: false};
39+
validateProperty(name: string): { error: boolean, msg?: string } {
40+
return { error: false };
4141
}
4242

43-
validateAttribute(name: string): {error: boolean, msg?: string} {
44-
return {error: false};
43+
validateAttribute(name: string): { error: boolean, msg?: string } {
44+
return { error: false };
4545
}
4646

4747
allKnownElementNames(): string[] {
48-
return [];
48+
return [];
49+
}
50+
51+
normalizeAnimationStyleProperty(propName: string): string {
52+
return propName;
53+
}
54+
55+
normalizeAnimationStyleValue(camelCaseProp: string, userProvidedProp: string, val: string | number):
56+
{ error: string, value: string } {
57+
return { error: null, value: val.toString() };
4958
}
5059
}
5160

5261
export class NativeScriptDomAdapter extends Parse5DomAdapter {
5362
static makeCurrent() {
54-
rendererLog("Setting DOM");
55-
setRootDomAdapter(new NativeScriptDomAdapter());
63+
rendererLog("Setting DOM");
64+
setRootDomAdapter(new NativeScriptDomAdapter());
5665
}
5766

5867
hasProperty(element, name: string) {
59-
//TODO: actually check if the property exists.
60-
return true;
68+
//TODO: actually check if the property exists.
69+
return true;
6170
}
6271

6372
log(arg: any): void {
64-
print(arg);
73+
print(arg);
6574
}
6675

6776
logError(arg: any): void {
68-
print(arg);
77+
print(arg);
6978
}
7079

7180
logGroup(arg: any): void {
72-
print(arg);
81+
print(arg);
7382
}
7483

7584
logGroupEnd(): void {

Diff for: ‎nativescript-angular/package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
},
2222
"dependencies": {
2323
"nativescript-intl": "~0.0.4",
24-
"@angular/core": "~2.1.1",
25-
"@angular/common": "~2.1.1",
26-
"@angular/compiler": "~2.1.1",
27-
"@angular/http": "~2.1.1",
28-
"@angular/platform-browser": "~2.1.1",
29-
"@angular/platform-browser-dynamic": "~2.1.1",
30-
"@angular/forms": "~2.1.1",
31-
"@angular/router": "~3.1.1",
24+
"@angular/core": "~2.2.0",
25+
"@angular/common": "~2.2.0",
26+
"@angular/compiler": "~2.2.0",
27+
"@angular/http": "~2.2.0",
28+
"@angular/platform-browser": "~2.2.0",
29+
"@angular/platform-browser-dynamic": "~2.2.0",
30+
"@angular/forms": "~2.2.0",
31+
"@angular/router": "~3.2.0",
3232
"rxjs": "5.0.0-beta.12",
3333
"reflect-metadata": "~0.1.8",
3434
"parse5": "1.3.2",
@@ -37,10 +37,10 @@
3737
"url": "0.10.3"
3838
},
3939
"devDependencies": {
40-
"tns-core-modules": ">=2.2.0 || >=2.2.0-2016",
40+
"tns-core-modules": ">=2.4.0 || >=2.4.0-2016",
4141
"zone.js": "^0.6.21",
4242
"typescript": "^2.0.2",
43-
"@angular/compiler-cli": "~2.1.1"
43+
"@angular/compiler-cli": "~2.2.0"
4444
},
4545
"nativescript": {}
4646
}

Diff for: ‎nativescript-angular/renderer.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import {
22
Inject, Injectable, Optional, NgZone,
33
Renderer, RootRenderer, RenderComponentType,
44
} from '@angular/core';
5-
import { AnimationPlayer, AnimationStyles, AnimationKeyframe } from "./private_import_core";
5+
import { AnimationPlayer } from "@angular/core";
6+
import { AnimationStyles, AnimationKeyframe } from "./private_import_core";
67
import {APP_ROOT_VIEW, DEVICE} from "./platform-providers";
78
import {isBlank} from "./lang-facade";
89
import {View} from "ui/core/view";

Diff for: ‎ng-sample/app/app.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
//profiling.start('application-start');
77

88
// "nativescript-angular/application" import should be first in order to load some required settings (like globals and reflect-metadata)
9-
import { NativeScriptModule, platformNativeScriptDynamic, onAfterLivesync, onBeforeLivesync } from "nativescript-angular/platform";
9+
import { NativeScriptModule, platformNativeScriptDynamic } from "nativescript-angular/platform";
10+
import { onAfterLivesync, onBeforeLivesync } from "nativescript-angular/platform-common";
1011
import { NgModule } from "@angular/core";
1112
import { Router } from "@angular/router";
1213
import { NativeScriptRouterModule } from "nativescript-angular/router";

Diff for: ‎ng-sample/package.json

+12-11
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,18 @@
2323
},
2424
"homepage": "https://github.com/NativeScript/template-hello-world",
2525
"dependencies": {
26-
"tns-core-modules": "2.3.0",
26+
"tns-core-modules": "2.4.0",
2727
"nativescript-angular": "file:../nativescript-angular",
2828
"nativescript-intl": "^0.0.4",
29-
"@angular/core": "~2.1.1",
30-
"@angular/common": "~2.1.1",
31-
"@angular/compiler": "~2.1.1",
32-
"@angular/forms": "~2.1.1",
33-
"@angular/http": "~2.1.1",
34-
"@angular/platform-browser": "~2.1.1",
35-
"@angular/platform-browser-dynamic": "~2.1.1",
36-
"@angular/router": "~3.1.0",
29+
"@angular/core": "~2.2.0",
30+
"@angular/common": "~2.2.0",
31+
"@angular/compiler": "~2.2.0",
32+
"@angular/forms": "~2.2.0",
33+
"@angular/http": "~2.2.0",
34+
"@angular/platform-browser": "~2.2.0",
35+
"@angular/platform-browser-dynamic": "~2.2.0",
36+
"@angular/upgrade": "~2.2.0",
37+
"@angular/router": "~3.2.0",
3738
"rxjs": "5.0.0-beta.12"
3839
},
3940
"devDependencies": {
@@ -51,10 +52,10 @@
5152
"nativescript": {
5253
"id": "org.nativescript.ngsample",
5354
"tns-android": {
54-
"version": "2.3.0"
55+
"version": "2.4.0"
5556
},
5657
"tns-ios": {
57-
"version": "2.3.0"
58+
"version": "2.4.0"
5859
}
5960
}
6061
}

Diff for: ‎tests/package.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"nativescript": {
33
"id": "org.nativescript.ngtests",
44
"tns-android": {
5-
"version": "2.3.0"
5+
"version": "2.4.0"
66
},
77
"tns-ios": {
8-
"version": "2.3.0"
8+
"version": "2.4.0"
99
}
1010
},
1111
"name": "ngtests",
@@ -27,15 +27,16 @@
2727
"homepage": "http://nativescript.org",
2828
"dependencies": {
2929
"nativescript-unit-test-runner": "^0.3.3",
30-
"tns-core-modules": "2.3.0",
30+
"tns-core-modules": "2.4.0",
3131
"nativescript-angular": "file:../nativescript-angular",
32-
"@angular/core": "~2.1.1",
33-
"@angular/common": "~2.1.1",
34-
"@angular/compiler": "~2.1.1",
35-
"@angular/http": "~2.1.1",
36-
"@angular/platform-browser": "~2.1.1",
37-
"@angular/platform-browser-dynamic": "~2.1.1",
38-
"@angular/router": "~3.1.1",
32+
"@angular/core": "~2.2.0",
33+
"@angular/common": "~2.2.0",
34+
"@angular/compiler": "~2.2.0",
35+
"@angular/http": "~2.2.0",
36+
"@angular/platform-browser": "~2.2.0",
37+
"@angular/platform-browser-dynamic": "~2.2.0",
38+
"@angular/upgrade": "~2.2.0",
39+
"@angular/router": "~3.2.0",
3940
"rxjs": "5.0.0-beta.12"
4041
},
4142
"devDependencies": {

0 commit comments

Comments
 (0)