Skip to content

Commit e32b237

Browse files
committed
chore: update angular to 2.0.0-alpha.46
- EventEmitter is now generic and requires a type [angular/angular#4893] - EventEmitter and Observable now use the .subscribe(generatorOrNext, error, complete) method instead of .observer(generator) [angular/angular/pull/4893] - tsconfig: set `moduleResolution: node` - angular/angular#5248 - imports: switch to file-relative paths
1 parent 90d830e commit e32b237

File tree

16 files changed

+26
-1199
lines changed

16 files changed

+26
-1199
lines changed

src/components/app/app.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component, NgIf, View } from 'angular2/angular2';
22
import { RouteConfig, RouterOutlet } from 'angular2/router';
3-
import { AuthRouteHelper } from 'core/auth/auth-route-helper';
4-
import { AuthService } from 'core/auth/auth-service';
5-
import { SignIn } from 'components/sign-in/sign-in';
6-
import { Tasks } from 'components/tasks/tasks';
3+
import { AuthRouteHelper } from '../../core/auth/auth-route-helper';
4+
import { AuthService } from '../../core/auth/auth-service';
5+
import { SignIn } from '../sign-in/sign-in';
6+
import { Tasks } from '../tasks/tasks';
77

88

99
@Component({

src/components/sign-in/sign-in.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, View } from 'angular2/angular2';
22
import { CanActivate, Router } from 'angular2/router';
3-
import { AuthRouteHelper } from 'core/auth/auth-route-helper';
4-
import { AuthService } from 'core/auth/auth-service';
3+
import { AuthRouteHelper } from '../../core/auth/auth-route-helper';
4+
import { AuthService } from '../../core/auth/auth-service';
55

66

77
@Component({

src/components/tasks/task-form/task-form.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, FORM_DIRECTIVES, View } from 'angular2/angular2';
2-
import { TaskService } from 'core/task/task-service';
2+
import { TaskService } from '../../../core/task/task-service';
33

44

55
@Component({

src/components/tasks/task-item/task-item.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import {
66
View
77
} from 'angular2/angular2';
88

9-
import { ITask } from 'core/task/task';
10-
import { TaskService } from 'core/task/task-service';
11-
import { Autofocus } from 'directives/autofocus-directive';
9+
import { ITask } from '../../../core/task/task';
10+
import { TaskService } from '../../../core/task/task-service';
11+
import { Autofocus } from '../../../directives/autofocus-directive';
1212

1313

1414
@Component({

src/components/tasks/task-list/task-list-filter-pipe.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Pipe, PipeTransform } from 'angular2/angular2';
2-
import { ITask } from 'core/task/task';
2+
import { ITask } from '../../../core/task/task';
33

44

55
@Pipe({

src/components/tasks/tasks.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Component, OnDestroy, View } from 'angular2/angular2';
22
import { CanActivate } from 'angular2/router';
33
import { List } from 'immutable';
4-
import { AuthRouteHelper } from 'core/auth/auth-route-helper';
5-
import { TaskStore } from 'core/task/task-store';
4+
import { AuthRouteHelper } from '../../core/auth/auth-route-helper';
5+
import { TaskStore } from '../../core/task/task-store';
66
import { TaskForm } from './task-form/task-form';
77
import { TaskList } from './task-list/task-list';
88

src/core/auth/auth-service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { EventEmitter } from 'angular2/angular2';
33

44
export class AuthService {
55
private authData: FirebaseAuthData;
6-
private emitter: EventEmitter = new EventEmitter();
6+
private emitter: EventEmitter<any> = new EventEmitter();
77

88
constructor(private ref: Firebase) {
99
this.authData = this.ref.getAuth();
@@ -43,7 +43,7 @@ export class AuthService {
4343
}
4444

4545
subscribe(next: (authenticated: boolean) => void): any {
46-
let subscription = this.emitter.observer({next});
46+
let subscription = this.emitter.subscribe(next);
4747
this.emit();
4848
return subscription;
4949
}

src/core/task/providers.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { provide } from 'angular2/angular2';
22
import Firebase from 'firebase';
3-
import { AuthService } from 'core/auth/auth-service';
4-
import { TaskService } from 'core/task/task-service';
5-
import { TaskStore } from 'core/task/task-store';
3+
import { AuthService } from '../auth/auth-service';
4+
import { TaskService } from './task-service';
5+
import { TaskStore } from './task-store';
66

77

88
export const TASK_PROVIDERS: any[] = [

src/core/task/task-store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { ITask } from './task';
66
export class TaskStore {
77
list: List<any> = List();
88
ready: Promise<any>;
9-
private emitter: EventEmitter = new EventEmitter();
9+
private emitter: EventEmitter<any> = new EventEmitter();
1010

1111
constructor(private ref: Firebase) {
1212
this.ref.on('child_added', this.created.bind(this));
@@ -21,7 +21,7 @@ export class TaskStore {
2121
}
2222

2323
subscribe(next: (list: List<any>) => void): any {
24-
return this.emitter.observer({next});
24+
return this.emitter.subscribe(next);
2525
}
2626

2727
created(snapshot: FirebaseDataSnapshot): void {

src/main.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { bootstrap, provide } from 'angular2/angular2';
22
import { APP_BASE_HREF, ROUTER_PROVIDERS } from 'angular2/router';
33
import Firebase from 'firebase';
4-
import { AUTH_PROVIDERS } from 'core/auth/providers';
5-
import { TASK_PROVIDERS } from 'core/task/providers';
6-
import { App } from 'components/app/app';
4+
import { AUTH_PROVIDERS } from './core/auth/providers';
5+
import { TASK_PROVIDERS } from './core/task/providers';
6+
import { App } from './components/app/app';
77

88

99
Firebase.INTERNAL.forceWebSockets();

0 commit comments

Comments
 (0)