Skip to content

Commit 5454c5c

Browse files
author
vakrilov
committed
ng-sample made working with the new structure
1 parent da1be1b commit 5454c5c

15 files changed

+17
-23
lines changed

Diff for: .gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ node_modules
33
tags
44
**/*.js.map
55

6+
/hooks
7+
68
nativescript-angular/**/*.d.ts
79
!nativescript-angular/global.d.ts
810
nativescript-angular/**/*.js
@@ -22,7 +24,6 @@ tests/lib
2224
tests/node_modules
2325

2426
ng-sample/app/**/*.js
25-
ng-sample/app/nativescript-angular
2627
ng-sample/app/global.d.ts
2728
ng-sample/platforms
2829
ng-sample/lib

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//profiling.start('application-start');
77

88
// this import should be first in order to load some required settings (like globals and reflect-metadata)
9-
import { nativeScriptBootstrap } from "./nativescript-angular/application";
10-
import { NS_ROUTER_PROVIDERS, routerTraceCategory } from "./nativescript-angular/router";
11-
import { rendererTraceCategory } from "./nativescript-angular/renderer";
9+
import { nativeScriptBootstrap } from "nativescript-angular/application";
10+
import { NS_ROUTER_PROVIDERS, routerTraceCategory } from "nativescript-angular/router";
11+
import { rendererTraceCategory } from "nativescript-angular/renderer";
1212

1313
import trace = require("trace");
1414
//trace.setCategories(routerTraceCategory + ", " + rendererTraceCategory);

Diff for: ng-sample/app/examples/action-bar/action-bar-test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {Component} from '@angular/core';
22
import {RouteConfig} from '@angular/router-deprecated';
33
import { Page} from "ui/page";
4-
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
5-
import {NS_DIRECTIVES} from "../../nativescript-angular/directives";
4+
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "nativescript-angular/router/ns-router";
5+
import {NS_DIRECTIVES} from "nativescript-angular/directives";
66

77
@Component({
88
selector: "first",

Diff for: ng-sample/app/examples/modal/modal-content.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component} from '@angular/core';
2-
import {ModalDialogParams} from "../../nativescript-angular/directives/dialogs";
2+
import {ModalDialogParams} from "nativescript-angular/directives/dialogs";
33

44
@Component({
55
selector: 'modal-content',

Diff for: ng-sample/app/examples/modal/modal-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import * as dialogs from "ui/dialogs";
3-
import {ModalDialogService, ModalDialogOptions, ModalDialogHost} from "../../nativescript-angular/directives/dialogs";
3+
import {ModalDialogService, ModalDialogOptions, ModalDialogHost} from "nativescript-angular/directives/dialogs";
44
import {ModalContent} from "./modal-content";
55

66
@Component({

Diff for: ng-sample/app/examples/navigation/login-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction, Router, RouteParams, RouteData} from '@angular/router-deprecated';
3-
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
3+
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "nativescript-angular/router/ns-router";
44
import {isBlank} from '@angular/core/src/facade/lang';
55

66
@Component({

Diff for: ng-sample/app/examples/navigation/nav-component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {ROUTER_DIRECTIVES, Router, OnActivate, OnDeactivate, CanReuse, OnReuse,
44
import {Location, LocationStrategy} from '@angular/common';
55
import {topmost} from "ui/frame";
66
import {Page} from "ui/page";
7-
import {NS_ROUTER_DIRECTIVES} from "../../nativescript-angular/router/ns-router";
7+
import {NS_ROUTER_DIRECTIVES} from "nativescript-angular/router/ns-router";
88

99

1010
@Component({

Diff for: ng-sample/app/examples/navigation/navigation-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
22
import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction} from '@angular/router-deprecated';
33

44
import {NavComponent} from "./nav-component";
5-
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
5+
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "nativescript-angular/router/ns-router";
66

77
@Component({
88
selector: "start-nav-test",

Diff for: ng-sample/app/examples/navigation/router-outlet-test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import {RouteConfig, ROUTER_PROVIDERS, ROUTER_DIRECTIVES, ComponentInstruction, RouteParams} from '@angular/router-deprecated';
3-
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "../../nativescript-angular/router/ns-router";
3+
import {NS_ROUTER_DIRECTIVES, NS_ROUTER_PROVIDERS} from "nativescript-angular/router/ns-router";
44

55
@Component({
66
selector: "first",

Diff for: ng-sample/app/examples/renderer-test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Component, Directive, Host, ElementRef, Input} from '@angular/core';
22
import {Observable} from 'data/observable';
3-
import {TextValueAccessor} from '../nativescript-angular/value-accessors/text-value-accessor';
4-
import {CheckedValueAccessor} from '../nativescript-angular/value-accessors/checked-value-accessor';
3+
import {TextValueAccessor} from 'nativescript-angular/value-accessors/text-value-accessor';
4+
import {CheckedValueAccessor} from 'nativescript-angular/value-accessors/checked-value-accessor';
55

66
@Component({
77
selector: 'templated-component',
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = require("nativescript-angular/hooks/before-livesync");

Diff for: ng-sample/hooks/before-prepare/10-copy-renderer.js

-7
This file was deleted.

Diff for: ng-sample/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"homepage": "https://github.com/NativeScript/template-hello-world",
2525
"dependencies": {
2626
"tns-core-modules": "2.0.0-angular-7",
27+
"nativescript-angular": "^0.1.6",
2728
"nativescript-intl": "^0.0.2",
2829
"@angular/common": "2.0.0-rc.1",
2930
"@angular/compiler": "2.0.0-rc.1",

Diff for: ng-sample/tsconfig.json

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"compilerOptions": {
3-
"outDir": "app",
4-
"rootDir": "app",
53
"module": "commonjs",
64
"target": "es5",
75
"inlineSourceMap": true,

0 commit comments

Comments
 (0)