Skip to content

Commit f81adae

Browse files
kdinevkdinev
authored
Merge pull request #86 from dkamburov/master
Update repo to 2.0.0
2 parents 6c63e27 + 3fa5411 commit f81adae

File tree

78 files changed

+2287
-1518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2287
-1518
lines changed

‎app/app.module.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { NgModule } from '@angular/core';
2+
import { BrowserModule } from '@angular/platform-browser';
3+
import { AppComponent } from './samples';
4+
import { IgGridComponent } from "../src/igniteui.angular2.js";
5+
6+
@NgModule({
7+
imports: [ BrowserModule ],
8+
declarations: [ AppComponent, IgGridComponent ],
9+
bootstrap: [ AppComponent ]
10+
})
11+
export class AppModule {}

‎app/boot.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import {bootstrap} from '@angular/platform-browser-dynamic'
2-
import {AppComponent} from './samples'
3-
4-
bootstrap(AppComponent);
5-
1+
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
2+
import {AppModule} from './app.module';
63

4+
platformBrowserDynamic().bootstrapModule(AppModule);

‎app/samples.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import {Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
2-
import {IgGridComponent} from "../src/igniteui.angular2.ts";
32

43
declare var jQuery: any;
54
@Component({
65
selector: 'my-app',
76
template: `
87
<ig-grid [(options)]="gridOptions" [(widgetId)]='id' (cellClick)="cellClickHandler($event)" (rendering)='renderedEventHandler($event)' ></ig-grid>
9-
`,
10-
directives: [IgGridComponent]
8+
`
119
})
1210
export class AppComponent {
1311
private gridOptions: IgGrid;

‎dist/npm/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "igniteui-angular2",
3-
"version": "1.0.2",
3+
"version": "1.0.8",
44
"description" : "A packaged version of Ignite UI components for Angular2",
55
"license": "MIT",
66
"typings": "igniteui.angular2.d.ts",
@@ -23,8 +23,8 @@
2323
"data grids"
2424
],
2525
"peerDependencies": {
26-
"@angular/common": "2.0.0-rc.5",
27-
"@angular/core": "2.0.0-rc.5",
26+
"@angular/common": "2.0.0",
27+
"@angular/core": "2.0.0",
2828
"reflect-metadata": "^0.1.3"
2929
}
3030
}

‎index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
1717
<script src="https://unpkg.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
1818

19-
<script src="https://unpkg.com/[email protected].12?main=browser"></script>
20-
<script src="https://unpkg.com/typescript@1.8.10/lib/typescript.js"></script>
19+
<script src="https://unpkg.com/[email protected].23?main=browser"></script>
20+
<script src="https://unpkg.com/typescript@2.0.2/lib/typescript.js"></script>
2121
<script src="https://unpkg.com/[email protected]"></script>
2222
<script src="https://unpkg.com/[email protected]/dist/system.src.js"></script>
2323
<script src="./systemjs.config.js"></script>

‎package.json‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
"url": "https://github.com/IgniteUI/igniteui-angular2.git"
88
},
99
"dependencies": {
10-
"@angular/common": "2.0.0-rc.5",
11-
"@angular/compiler": "2.0.0-rc.5",
12-
"@angular/core": "2.0.0-rc.5",
13-
"@angular/http": "2.0.0-rc.5",
14-
"@angular/platform-browser": "2.0.0-rc.5",
15-
"@angular/platform-browser-dynamic": "2.0.0-rc.5",
16-
"@angular/router": "3.0.0-rc.1",
17-
"@angular/router-deprecated": "2.0.0-rc.2",
18-
"@angular/upgrade": "2.0.0-rc.5",
10+
"@angular/common": "2.0.0",
11+
"@angular/compiler": "2.0.0",
12+
"@angular/core": "2.0.0",
13+
"@angular/http": "2.0.0",
14+
"@angular/forms": "2.0.0",
15+
"@angular/platform-browser": "2.0.0",
16+
"@angular/platform-browser-dynamic": "2.0.0",
17+
"@angular/router": "3.0.0",
18+
"@angular/upgrade": "2.0.0",
1919

2020
"systemjs": "0.19.27",
2121
"es6-shim": "^0.35.0",
2222
"reflect-metadata": "^0.1.3",
23-
"rxjs": "5.0.0-beta.6",
24-
"zone.js": "0.6.12",
23+
"rxjs": "5.0.0-beta.12",
24+
"zone.js": "^0.6.23",
2525

2626
"bootstrap": "^3.3.6"
2727
},
2828
"devDependencies": {
29-
"concurrently": "^2.0.0",
29+
"concurrently": "^2.2.0",
3030
"gulp-watch": "^4.3.5",
3131
"jasmine-core": "^2.4.1",
3232
"karma": "^0.13.19",
@@ -36,9 +36,10 @@
3636
"karma-coverage": "",
3737
"karma-remap-istanbul": "",
3838
"lite-server": "^2.2.0",
39-
"typescript": "^1.8.10",
39+
"typescript": "^2.0.2",
4040
"typings": "^0.8.1",
41-
"coveralls": "^2.11.9"
41+
"coveralls": "^2.11.9",
42+
"traceur": "^0.0.111"
4243
},
4344
"scripts": {
4445
"postinstall": "npm run typings && npm prune",

‎samples/igCombo/app.ts‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import {Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
2-
import {IgComboComponent} from "../../src/igniteui.angular2.ts";
3-
import {Northwind} from "./../data/northwind.ts";
4-
import {bootstrap } from '@angular/platform-browser-dynamic';
5-
import { FORM_DIRECTIVES } from '@angular/common';
1+
import { Component, NgModule } from '@angular/core';
2+
import { IgComboComponent } from "../../src/igniteui.angular2.js";
3+
import { Northwind } from "./../data/northwind.js";
4+
import { BrowserModule } from '@angular/platform-browser';
5+
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
6+
import { FormsModule } from '@angular/forms';
67

78
declare var jQuery: any;
89
@Component({
910
selector: 'my-app',
10-
templateUrl: "./igComboTemplate.html",
11-
directives: [FORM_DIRECTIVES, IgComboComponent]
11+
templateUrl: "./igComboTemplate.html"
1212
})
1313
export class AppComponent {
1414
public options: IgCombo;
@@ -30,4 +30,11 @@ export class AppComponent {
3030
}
3131
}
3232

33-
bootstrap(AppComponent);
33+
@NgModule({
34+
imports: [ BrowserModule, FormsModule ],
35+
declarations: [ AppComponent, IgComboComponent ],
36+
bootstrap: [ AppComponent ]
37+
})
38+
export class AppModule {}
39+
40+
platformBrowserDynamic().bootstrapModule(AppModule);

‎samples/igCombo/igCombo.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
6464
<script src="https://unpkg.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
6565

66-
<script src="https://unpkg.com/[email protected].12?main=browser"></script>
67-
<script src="https://unpkg.com/typescript@1.8.10/lib/typescript.js"></script>
66+
<script src="https://unpkg.com/[email protected].23?main=browser"></script>
67+
<script src="https://unpkg.com/typescript@2.0.2/lib/typescript.js"></script>
6868
<script src="https://unpkg.com/[email protected]"></script>
6969
<script src="https://unpkg.com/[email protected]/dist/system.src.js"></script>
7070
<script src="./../../systemjs.config.js"></script>

‎samples/igDataChart/app.ts‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
2-
import { IgDataChartComponent, IgZoombarComponent } from "../../src/igniteui.angular2.ts";
3-
import {bootstrap } from '@angular/platform-browser-dynamic'
1+
import { Component, NgModule } from '@angular/core';
2+
import { IgDataChartComponent, IgZoombarComponent } from "../../src/igniteui.angular2.js";
3+
import { BrowserModule } from '@angular/platform-browser';
4+
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
45

56
declare var jQuery: any;
67
@Component({
78
selector: 'my-app',
8-
templateUrl: `../igDataChart/igDataChartTemplate.html`,
9-
directives: [IgDataChartComponent, IgZoombarComponent]
9+
templateUrl: `../igDataChart/igDataChartTemplate.html`
1010
})
1111
export class AppComponent {
1212
private data: any;
@@ -46,4 +46,12 @@ export class AppComponent {
4646
};
4747
}
4848
}
49-
bootstrap(AppComponent);
49+
50+
@NgModule({
51+
imports: [ BrowserModule ],
52+
declarations: [ AppComponent, IgDataChartComponent, IgZoombarComponent ],
53+
bootstrap: [ AppComponent ]
54+
})
55+
export class AppModule {}
56+
57+
platformBrowserDynamic().bootstrapModule(AppModule);

‎samples/igDataChart/igDataChart.html‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
<!-- 1. Load libraries -->
88
<script src="http://code.jquery.com/jquery-1.12.3.js"></script>
99
<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
10-
<script src="https://code.angularjs.org/2.0.0-beta.14/angular2-polyfills.js"></script>
1110
<!-- IE required polyfills, in this exact order -->
1211
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
1312
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
1413
<script src="https://unpkg.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
1514

16-
<script src="https://unpkg.com/[email protected].12?main=browser"></script>
17-
<script src="https://unpkg.com/typescript@1.8.10/lib/typescript.js"></script>
15+
<script src="https://unpkg.com/[email protected].23?main=browser"></script>
16+
<script src="https://unpkg.com/typescript@2.0.2/lib/typescript.js"></script>
1817
<script src="https://unpkg.com/[email protected]"></script>
1918
<script src="https://unpkg.com/[email protected]/dist/system.src.js"></script>
2019
<script src="./../../systemjs.config.js"></script>

0 commit comments

Comments
 (0)