Skip to content

Commit f390e8a

Browse files
MayaKirovaMayaKirova
committed
Merge remote-tracking branch 'refs/remotes/IgniteUI/master'
2 parents e034ce8 + 66c03b1 commit f390e8a

File tree

85 files changed

+3270
-1664
lines changed

Some content is hidden

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

85 files changed

+3270
-1664
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![NPM version](https://img.shields.io/npm/v/igniteui-angular2.svg?style=flat)](https://www.npmjs.com/package/igniteui-angular2)
44
[![Build Status](https://travis-ci.org/IgniteUI/igniteui-angular2.svg?branch=master)](https://travis-ci.org/IgniteUI/igniteui-angular2)
5-
[![Issue Stats](http://issuestats.com/github/IgniteUI/igniteui-angular2/badge/pr?style=flat)](http://issuestats.com/github/IgniteUI/igniteui-angular2)
65
[![Coverage Status](https://coveralls.io/repos/github/IgniteUI/igniteui-angular2/badge.svg?branch=master)](https://coveralls.io/github/IgniteUI/igniteui-angular2?branch=master)
76

87
Use the components found in `src\igniteui.angular2.ts` to use [Ignite UI](http://igniteui.com) controls in [Angular 2](https://angular.io/) applications. [Work with the running samples here](http://igniteui.github.io/igniteui-angular2).

‎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";
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: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import {Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
2-
import {IgGridComponent} from "../src/igniteui.angular2.ts";
1+
import { Component } from '@angular/core';
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.9",
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.3",
27-
"@angular/core": "2.0.0-rc.3",
26+
"@angular/common": "2.0.0",
27+
"@angular/core": "2.0.0",
2828
"reflect-metadata": "^0.1.3"
2929
}
3030
}

‎index.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<!-- IE required polyfills, in this exact order -->
1515
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
17-
<script src="https://npmcdn.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
17+
<script src="https://unpkg.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
1818

19-
<script src="https://npmcdn.com/[email protected].12?main=browser"></script>
20-
<script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>
21-
<script src="https://npmcdn.com/[email protected]"></script>
22-
<script src="https://npmcdn.com/[email protected]/dist/system.src.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>
21+
<script src="https://unpkg.com/[email protected]"></script>
22+
<script src="https://unpkg.com/[email protected]/dist/system.src.js"></script>
2323
<script src="./systemjs.config.js"></script>
2424

2525
<!-- Ignite UI Required Combined JavaScript Files -->
@@ -112,7 +112,7 @@
112112
<div class="row">
113113
<div class="col-sm-12 col-lg-5">
114114
<h1>Ignite UI</h1>
115-
<h2>Angular 2 Directives</h2>
115+
<h2>Angular 2 Components</h2>
116116
</div>
117117
<div class="col-sm-12 header-fg col-lg-7"></div>
118118
</div>
@@ -130,21 +130,19 @@ <h2>Live sample...</h2>
130130
<h2>Code...</h2>
131131
<div style="height: 511px; overflow-y: scroll;">
132132
<pre>
133-
import {Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
134-
import {IgGridComponent} from "../src/igniteui.angular2.ts";
133+
import { Component } from '@angular/core';
135134

136135
declare var jQuery: any;
137136
@Component({
138-
selector: 'my-app',
137+
selector: "my-app",
139138
template: `
140139
&lt;ig-grid
141140
[(options)]=&quot;gridOptions&quot;
142-
[(widgetId)]='id'
141+
[(widgetId)]="id"
143142
(cellClick)=&quot;cellClickHandler($event)&quot;
144-
(rendering)='renderedEventHandler($event)'
143+
(rendering)="renderedEventHandler($event)"
145144
&gt;&lt;/ig-grid&gt;
146-
`,
147-
directives: [IgGridComponent]
145+
`
148146
})
149147
export class AppComponent {
150148
private gridOptions: IgGrid;
@@ -208,6 +206,8 @@ <h2>Samples</h2>
208206
<ul class="dropdown-menu" role="menu">
209207
<li><a href="samples/igGrid/igGrid.html">Default</a></li>
210208
<li><a href="samples/igGrid-TopLevelOpts/igGrid-TopLevelOpts.html">Top-level template options</a></li>
209+
<li><a href="samples/igGrid-ComplexOpts/igGrid-ComplexOpts.html">Complex template options</a></li>
210+
<li><a href="samples/igGrid-HTTPClient/igGrid-HTTPClient.html">Grid with HTTP client</a></li>
211211
</ul>
212212
</div>
213213
<a class="btn btn-default" href="samples/igHierarchicalGrid/igHierarchicalGrid.html">igHierarchicalGrid</a>

‎package.json‎

Lines changed: 65 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,65 @@
1-
{
2-
"name": "igniteui-angular2",
3-
"version": "1.0.0",
4-
"license": "MIT",
5-
"repository": {
6-
"type": "git",
7-
"url": "https://github.com/IgniteUI/igniteui-angular2.git"
8-
},
9-
"dependencies": {
10-
"@angular/common": "2.0.0-rc.3",
11-
"@angular/compiler": "2.0.0-rc.3",
12-
"@angular/core": "2.0.0-rc.3",
13-
"@angular/http": "2.0.0-rc.3",
14-
"@angular/platform-browser": "2.0.0-rc.3",
15-
"@angular/platform-browser-dynamic": "2.0.0-rc.3",
16-
"@angular/router": "2.0.0-rc.2",
17-
"@angular/router-deprecated": "2.0.0-rc.2",
18-
"@angular/upgrade": "2.0.0-rc.3",
19-
20-
"systemjs": "0.19.27",
21-
"es6-shim": "^0.35.0",
22-
"reflect-metadata": "^0.1.3",
23-
"rxjs": "5.0.0-beta.6",
24-
"zone.js": "^0.6.12",
25-
26-
"bootstrap": "^3.3.6"
27-
},
28-
"devDependencies": {
29-
"concurrently": "^2.0.0",
30-
"gulp-watch": "^4.3.5",
31-
"jasmine-core": "^2.4.1",
32-
"karma": "^0.13.19",
33-
"karma-chrome-launcher": "^0.2.2",
34-
"karma-jasmine": "^0.2.2",
35-
"karma-junit-reporter": "^0.4.2",
36-
"karma-coverage": "",
37-
"karma-remap-istanbul": "",
38-
"lite-server": "^2.2.0",
39-
"typescript": "^1.8.10",
40-
"typings": "^0.8.1",
41-
"coveralls": "^2.11.9"
42-
},
43-
"scripts": {
44-
"postinstall": "npm run typings && npm prune",
45-
"typings": "node node_modules/typings/dist/bin.js install",
46-
47-
"start": "npm run lite",
48-
"lite": "lite-server",
49-
50-
"watch": "node node_modules/typescript/bin/tsc -w",
51-
"build": "node node_modules/typescript/bin/tsc",
52-
"bundle": "node node_modules/typescript/bin/tsc -d && npm run prepare-dist",
53-
"prepare-dist": "cp src/igniteui.angular2.js dist/npm/ && cp src/igniteui.angular2.d.ts dist/npm/ && cp src/igniteui.d.ts dist/npm/ && cp src/jquery.d.ts dist/npm/",
54-
55-
"pretest": "npm run build",
56-
"test": "karma start tests/karma.conf.js && npm run remap-istanbul",
57-
58-
"remap-istanbul": "npm run copy-coverage-report && npm run remap-istanbul-html && npm run remap-istanbul-lcov",
59-
"remap-istanbul-html": "remap-istanbul -i coverage/karma-tmp/coverage.json -o coverage/html-report -t html",
60-
"remap-istanbul-lcov": "remap-istanbul -i coverage/karma-tmp/coverage.json -o coverage/lcov.info -t lcovonly",
61-
"copy-coverage-report": "cp coverage/karma-tmp/**/coverage*.json coverage/karma-tmp/"
62-
}
63-
}
1+
{
2+
"name": "igniteui-angular2",
3+
"version": "1.0.0",
4+
"license": "MIT",
5+
"repository": {
6+
"type": "git",
7+
"url": "https://github.com/IgniteUI/igniteui-angular2.git"
8+
},
9+
"dependencies": {
10+
"@angular/common": "~2.0.2",
11+
"@angular/compiler": "~2.0.2",
12+
"@angular/core": "~2.0.2",
13+
"@angular/http": "~2.0.2",
14+
"@angular/forms": "~2.0.2",
15+
"@angular/platform-browser": "~2.0.2",
16+
"@angular/platform-browser-dynamic": "~2.0.2",
17+
"@angular/router": "~3.0.2",
18+
"@angular/upgrade": "~2.0.2",
19+
"angular-in-memory-web-api": "~0.1.5",
20+
21+
"systemjs": "0.19.27",
22+
"es6-shim": "^0.35.0",
23+
"reflect-metadata": "^0.1.3",
24+
"rxjs": "5.0.0-beta.12",
25+
"zone.js": "^0.6.23",
26+
27+
"bootstrap": "^3.3.6"
28+
},
29+
"devDependencies": {
30+
"concurrently": "^2.2.0",
31+
"gulp-watch": "^4.3.5",
32+
"jasmine-core": "^2.4.1",
33+
"karma": "^0.13.19",
34+
"karma-chrome-launcher": "^0.2.2",
35+
"karma-jasmine": "^0.2.2",
36+
"karma-junit-reporter": "^0.4.2",
37+
"karma-coverage": "",
38+
"karma-remap-istanbul": "",
39+
"lite-server": "^2.2.0",
40+
"typescript": "^2.0.2",
41+
"typings": "^0.8.1",
42+
"coveralls": "^2.11.9",
43+
"traceur": "^0.0.111"
44+
},
45+
"scripts": {
46+
"postinstall": "npm run typings && npm prune",
47+
"typings": "node node_modules/typings/dist/bin.js install",
48+
49+
"start": "npm run lite",
50+
"lite": "lite-server",
51+
52+
"watch": "node node_modules/typescript/bin/tsc -w",
53+
"build": "node node_modules/typescript/bin/tsc",
54+
"bundle": "node node_modules/typescript/bin/tsc -d && npm run prepare-dist",
55+
"prepare-dist": "cp src/igniteui.angular2.js dist/npm/ && cp src/igniteui.angular2.d.ts dist/npm/ && cp src/igniteui.angular2.ts dist/npm/ && cp src/igniteui.d.ts dist/npm/ && cp src/jquery.d.ts dist/npm/",
56+
57+
"pretest": "npm run build",
58+
"test": "karma start tests/karma.conf.js && npm run remap-istanbul",
59+
60+
"remap-istanbul": "npm run copy-coverage-report && npm run remap-istanbul-html && npm run remap-istanbul-lcov",
61+
"remap-istanbul-html": "remap-istanbul -i coverage/karma-tmp/coverage.json -o coverage/html-report -t html",
62+
"remap-istanbul-lcov": "remap-istanbul -i coverage/karma-tmp/coverage.json -o coverage/lcov.info -t lcovonly",
63+
"copy-coverage-report": "cp coverage/karma-tmp/**/coverage*.json coverage/karma-tmp/"
64+
}
65+
}

0 commit comments

Comments
 (0)