Skip to content

Commit 64dccbf

Browse files
committed
Fix a compile error in main-page.ts
1 parent 9b1ac47 commit 64dccbf

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

ng-sample/gruntfile.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,25 +62,27 @@ module.exports = function(grunt) {
6262
],
6363
dest: 'src'
6464
},
65-
tnsifyAngular: {
65+
tnsifyAngularAndroid: {
6666
expand: true,
6767
cwd: 'app/',
6868
src: [
6969
"angular2/**/*",
7070
"css/**/*",
7171
"nativescript-angular/**/*",
7272
],
73-
dest: 'node_modules',
73+
dest: 'platforms/android/src/main/assets/app/tns_modules',
74+
//dest: 'node_modules',
7475
},
75-
tnsifyCssStub: {
76+
tnsifyCssStubAndroid: {
7677
expand: true,
7778
cwd: 'app/',
7879
src: [
7980
"css/**/*",
8081
],
81-
dest: 'node_modules/tns-core-modules',
82+
dest: 'platforms/android/src/main/assets/app/tns_modules',
83+
//dest: 'node_modules',
8284
},
83-
tnsifyRxJsAngular: {
85+
tnsifyRxJsAndroid: {
8486
expand: true,
8587
cwd: 'node_modules/',
8688
src: [
@@ -175,11 +177,11 @@ module.exports = function(grunt) {
175177
});
176178

177179
grunt.registerTask("preDeploy", [
178-
"copy:tnsifyAngular",
180+
"copy:tnsifyAngularAndroid",
179181
"fixAngularPackageJson",
180-
"copy:tnsifyCssStub",
181-
"copy:tnsifyRxJsAngular",
182-
"clean:appBeforeDeploy",
182+
"copy:tnsifyCssStubAndroid",
183+
"copy:tnsifyRxJsAndroid",
184+
//"clean:appBeforeDeploy",
183185
]);
184186

185187
grunt.registerTask("full-clean", [

ng-sample/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"nativescript": {
4444
"id": "org.nativescript.ngsample",
4545
"tns-android": {
46-
"version": "1.3.0"
46+
"version": "1.4.0"
4747
}
4848
}
4949
}

ng-sample/src/main-page.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
99
var lifeCycle: LifeCycle = null;
1010

1111
@Component({
12-
selector: 'main-page',
13-
hostAttributes: {
14-
}
12+
selector: 'main-page'
1513
})
1614
@View({
1715
directives: [NgIf, NgFor],
@@ -54,7 +52,6 @@ class MainPage {
5452
onSave($event, name, $el) {
5553
console.log('onSave event ' + $event + ' name ' + name);
5654
alert(name);
57-
$el.printTree();
5855
}
5956

6057
onToggleDetails() {

0 commit comments

Comments
 (0)