Skip to content

Commit fb41321

Browse files
authored
feat: Merge pull request #118 from allahbaksh/master - Upgrade to Angular 2.0.1
Upgrade to Angular 2.0.1
2 parents bd55638 + b0cd9b3 commit fb41321

File tree

14 files changed

+112
-105
lines changed

14 files changed

+112
-105
lines changed

app/app.module.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ import { NgModule } from '@angular/core';
22
import { BrowserModule } from '@angular/platform-browser';
33
import { FormsModule } from '@angular/forms';
44
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
5-
5+
import {MaterializeDirective} from "../src/index";
6+
import {MaterialInput,
7+
Option,
8+
MaterialSelect} from "./components/model-bindings/index"
69
import { AppComponent } from './app.component';
710
import {
811
Buttons,
@@ -16,7 +19,7 @@ import {
1619
DatePicker,
1720
ModelBindings
1821
} from './components/index';
19-
import { routing } from './app.routing'
22+
import { routing, appRoutingProviders } from './app.routing'
2023

2124

2225
@NgModule({
@@ -31,15 +34,19 @@ import { routing } from './app.routing'
3134
Forms,
3235
SideNav,
3336
DatePicker,
34-
ModelBindings
37+
ModelBindings,
38+
MaterializeDirective,
39+
MaterialInput,
40+
MaterialSelect,
41+
3542
],
3643
imports: [
3744
BrowserModule,
3845
FormsModule,
3946
routing
4047
],
4148
providers: [
42-
{ provide: LocationStrategy, useClass: HashLocationStrategy },
49+
{ provide: LocationStrategy, useClass: HashLocationStrategy },appRoutingProviders
4350
],
4451
bootstrap: [AppComponent]
4552
})

app/app.routing.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { ModuleWithProviders } from '@angular/core';
12
import { Routes, RouterModule } from '@angular/router';
23
import {
34
Buttons,
@@ -57,4 +58,8 @@ const appRoutes: Routes = [
5758
}
5859
];
5960

60-
export const routing = RouterModule.forRoot(appRoutes);
61+
62+
export const appRoutingProviders: any[] = [
63+
64+
];
65+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);

app/components/collapsible.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import {MaterializeDirective} from "../../src/index";
1+
import {MaterializeDirective} from "./../../src/index";
22
import {Component} from "@angular/core"
33

44
@Component({
55
selector: "collapsible",
6-
directives: [MaterializeDirective],
76
template: `
87
<ul materialize="collapsible" class="collapsible" data-collapsible="accordion">
98
<li>

app/components/datepicker.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {Component} from "@angular/core"
33

44
@Component({
55
selector: "datePicker",
6-
directives: [MaterializeDirective],
76
template: `
87
<form materialize class="col s12">
98
<div class="row">

app/components/dialogs.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {Component,EventEmitter} from "@angular/core"
33

44
@Component({
55
selector: "dialogs",
6-
directives: [MaterializeDirective],
76
template: `
87
<!-- Modal Trigger -->
98
<a materialize="leanModal" [materializeParams]="[{dismissible: false}]" class="waves-effect waves-light btn modal-trigger" href="#modal1">Modal</a>

app/components/dropdown.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {Component} from "@angular/core"
33

44
@Component({
55
selector: "dropdown",
6-
directives: [MaterializeDirective],
76
template: `
87
<!-- Dropdown Trigger -->
98
<a materialize="dropdown" class='dropdown-button btn' href='#' data-activates='dropdown1'>Drop Me!</a>

app/components/forms.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {Component,OnInit} from "@angular/core"
33

44
@Component({
55
selector: "forms",
6-
directives: [MaterializeDirective],
76
template: `
87
<form materialize class="col s12">
98
<div class="row">
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export { MaterialInput } from "./input";
2+
export { Option } from "./option";
3+
export { MaterialSelect } from "./select";

app/components/model-bindings/input.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import * as Materialize from "../../../src/index";
44

55
@Component({
66
selector: "materialInput",
7-
directives: [MaterializeDirective],
87
inputs: ['model: model'],
98
outputs: ['modelChange'],
109
template: `

app/components/model-bindings/model-bindings.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {Observable} from "rxjs/Observable";
99

1010
@Component({
1111
selector: "actionsMain",
12-
directives: [MaterializeDirective, MaterialInput, MaterialSelect],
1312
template: `
1413
<form materialize class="col s12">
1514
<div class="row">

0 commit comments

Comments
 (0)