Skip to content

Commit 14d0521

Browse files
MayaKirovaMayaKirova
committed
Merge remote-tracking branch 'refs/remotes/IgniteUI/master'
2 parents 2485c1d + 09e3d17 commit 14d0521

File tree

77 files changed

+1732
-1764
lines changed

Some content is hidden

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

77 files changed

+1732
-1764
lines changed

‎app/boot.js‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/boot.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {bootstrap} from 'angular2/platform/browser'
1+
import {bootstrap} from '@angular/platform-browser-dynamic'
22
import {AppComponent} from './samples'
33

44
bootstrap(AppComponent);

‎app/samples.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Component, Inject, ElementRef, EventEmitter, HostListener} from 'angular2/core';
1+
import {Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
22
import {IgGridComponent} from "../src/igniteui.angular2.ts";
33

44
declare var jQuery: any;

‎index.html‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
<!-- 1. Load libraries -->
1212
<script src="http://code.jquery.com/jquery-1.12.3.js"></script>
1313
<script src="http://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script>
14-
<!-- IE required polyfills, in this exact order -->
15-
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
16-
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
17-
<script src="https://npmcdn.com/[email protected]/es6/dev/src/testing/shims_for_IE.js"></script>
18-
<script src="https://code.angularjs.org/2.0.0-beta.14/angular2-polyfills.js"></script>
19-
<script src="https://code.angularjs.org/tools/system.js"></script>
20-
<script src="https://code.angularjs.org/tools/typescript.js"></script>
21-
<script src="https://code.angularjs.org/2.0.0-beta.14/Rx.js"></script>
22-
<script src="https://code.angularjs.org/2.0.0-beta.14/angular2.dev.js"></script>
14+
<!-- IE required polyfills, in this exact order -->
15+
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
16+
<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>
18+
19+
<script src="./../node_modules/zone.js/dist/zone.js"></script>
20+
<script src="./../node_modules/typescript/lib/typescript.js"></script>
21+
<script src="./../node_modules/reflect-metadata/Reflect.js"></script>
22+
<script src="./../node_modules/systemjs/dist/system.js"></script>
23+
<script src="./../systemjs.config.js"></script>
2324

2425
<!-- Ignite UI Required Combined JavaScript Files -->
2526
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
@@ -29,13 +30,8 @@
2930
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
3031
<link rel="stylesheet" href="samples/sample.css" />
3132
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
32-
<!-- 2. Configure SystemJS -->
33+
3334
<script>
34-
System.config({
35-
transpiler: 'typescript',
36-
typescriptOptions: { emitDecoratorMetadata: true },
37-
packages: {'app': {defaultExtension: 'ts'}}
38-
});
3935
System.import('app/boot')
4036
.then(null, console.error.bind(console));
4137
</script>
@@ -134,7 +130,7 @@ <h2>Live sample...</h2>
134130
<h2>Code...</h2>
135131
<div style="height: 511px; overflow-y: scroll;">
136132
<pre>
137-
import {Component, Inject, ElementRef, EventEmitter, HostListener} from 'angular2/core';
133+
import {Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
138134
import {IgGridComponent} from "../src/igniteui.angular2.ts";
139135

140136
declare var jQuery: any;

‎package.json‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,27 @@
77
"url": "https://github.com/IgniteUI/igniteui-angular2.git"
88
},
99
"dependencies": {
10-
"angular2": "2.0.0-beta.14",
11-
"systemjs": "0.19.25",
10+
"@angular/common": "2.0.0-rc.1",
11+
"@angular/compiler": "2.0.0-rc.1",
12+
"@angular/core": "2.0.0-rc.1",
13+
"@angular/http": "2.0.0-rc.1",
14+
"@angular/platform-browser": "2.0.0-rc.1",
15+
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
16+
"@angular/router": "2.0.0-rc.1",
17+
"@angular/router-deprecated": "2.0.0-rc.1",
18+
"@angular/upgrade": "2.0.0-rc.1",
19+
20+
"systemjs": "0.19.27",
1221
"es6-shim": "^0.35.0",
13-
"reflect-metadata": "0.1.2",
14-
"rxjs": "5.0.0-beta.2",
15-
"zone.js": "0.6.6"
22+
"reflect-metadata": "^0.1.3",
23+
"rxjs": "5.0.0-beta.6",
24+
"zone.js": "^0.6.12",
25+
26+
"angular2-in-memory-web-api": "0.0.7",
27+
"bootstrap": "^3.3.6"
1628
},
1729
"devDependencies": {
30+
"concurrently": "^2.0.0",
1831
"gulp-watch": "^4.3.5",
1932
"jasmine-core": "^2.4.1",
2033
"karma": "^0.13.19",
@@ -24,8 +37,8 @@
2437
"karma-coverage": "",
2538
"karma-remap-istanbul": "",
2639
"lite-server": "^2.2.0",
27-
"typescript": "^1.8.9",
28-
"typings": "^0.7.12",
40+
"typescript": "^1.8.10",
41+
"typings": "^0.8.1",
2942
"coveralls": "^2.11.9"
3043
},
3144
"scripts": {

‎samples/igCombo/app.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import {Component, Inject, ElementRef, EventEmitter, HostListener} from 'angular2/core';
1+
import {Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
22
import {IgComboComponent} from "../../src/igniteui.angular2.ts";
33
import {Northwind} from "./../data/northwind.ts";
4-
import {bootstrap } from 'angular2/platform/browser'
4+
import {bootstrap } from '@angular/platform-browser-dynamic'
55

66
declare var jQuery: any;
77
@Component({

‎samples/igCombo/igCombo.html‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
<!DOCTYPE html>
22
<html>
3+
34
<head>
45
<title>igCombo - Ignite UI integration with Angular 2</title>
56
<meta charset="utf-8">
67
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/themes/infragistics/infragistics.theme.css" rel="stylesheet" />
8-
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.shared.css" rel="stylesheet" />
8+
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/themes/infragistics/infragistics.theme.css"
9+
rel="stylesheet" />
10+
<link type="text/css" href="http://cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.shared.css"
11+
rel="stylesheet" />
912
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
10-
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
13+
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css"
14+
/>
1115
<link rel="stylesheet" href="/samples/sample.css" />
12-
13-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.validator.css" rel="stylesheet" />
14-
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.combo.css" rel="stylesheet" />
16+
17+
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.validator.css"
18+
rel="stylesheet" />
19+
<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.combo.css" rel="stylesheet"
20+
/>
1521

1622
</head>
23+
1724
<body class="container">
1825

1926
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
@@ -25,7 +32,7 @@
2532
<span class="icon-bar"></span>
2633
<span class="icon-bar"></span>
2734
</button>
28-
<a class="navbar-brand" href="/">Ignite UI Angular 2 Components <span class="badge alert-info">Preview</span></a>
35+
<a class="navbar-brand" href="/">Ignite UI Angular 2 Components <span class="badge alert-info">Preview</span></a>
2936
</div>
3037
<div class="navbar-collapse collapse">
3138
<ul class="nav navbar-nav">
@@ -50,31 +57,29 @@
5057
<!-- 1. Load libraries -->
5158
<script src="http://code.jquery.com/jquery-1.12.3.js"></script>
5259
<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
53-
<!-- IE required polyfills, in this exact order -->
60+
61+
<!-- Polyfill(s) for older browsers -->
5462
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
5563
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
56-
<script src="https://npmcdn.com/[email protected]/es6/dev/src/testing/shims_for_IE.js"></script>
64+
<script src="https://npmcdn.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
65+
66+
<script src="./../../node_modules/zone.js/dist/zone.js?main=browser"></script>
67+
<script src="./../../node_modules/typescript/lib/typescript.js"></script>
68+
<script src="./../../node_modules/reflect-metadata/Reflect.js"></script>
69+
<script src="./../../node_modules/systemjs/dist/system.src.js"></script>
70+
<script src="./../../systemjs.config.js"></script>
5771

58-
<script src="https://code.angularjs.org/2.0.0-beta.14/angular2-polyfills.js"></script>
59-
<script src="https://code.angularjs.org/tools/system.js"></script>
60-
<script src="https://code.angularjs.org/tools/typescript.js"></script>
61-
<script src="https://code.angularjs.org/2.0.0-beta.14/Rx.js"></script>
62-
<script src="https://code.angularjs.org/2.0.0-beta.14/angular2.dev.js"></script>
6372
<!-- Ignite UI Required Combined JavaScript Files -->
6473
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
6574
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.lob.js"></script>
6675
<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.js"></script>
6776
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
68-
<!-- 2. Configure SystemJS -->
77+
6978
<script>
70-
System.config({
71-
transpiler: 'typescript',
72-
typescriptOptions: { emitDecoratorMetadata: true },
73-
packages: { 'app': { defaultExtension: 'ts' } }
74-
});
7579
System.import('app.ts')
7680
.then(null, console.error.bind(console));
7781
</script>
7882

7983
</body>
84+
8085
</html>

‎samples/igCombo/igComboTemplate.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ <h1 class="push-down-md"><a href="http://igniteui.com/combo/overview" target="_b
4343
<h2 class="h3">Edit Product Name</h2>
4444
<div class="row">
4545

46-
<div class="col-sm-3" *ngFor="#record of northwind">
46+
<div class="col-sm-3" *ngFor="let record of northwind">
4747
<input class="form-control" [(ngModel)]="record.ProductName">
4848
</div>
4949

‎samples/igDataChart/app.ts‎

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

55
declare var jQuery: any;
66
@Component({

‎samples/igDataChart/igDataChart.html‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
<!-- IE required polyfills, in this exact order -->
1212
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
1313
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
14-
<script src="https://npmcdn.com/[email protected]/es6/dev/src/testing/shims_for_IE.js"></script>
15-
<script src="https://code.angularjs.org/tools/system.js"></script>
16-
<script src="https://code.angularjs.org/tools/typescript.js"></script>
17-
<script src="https://code.angularjs.org/2.0.0-beta.14/Rx.js"></script>
18-
<script src="https://code.angularjs.org/2.0.0-beta.14/angular2.dev.js"></script>
14+
<script src="https://npmcdn.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
15+
16+
<script src="./../../node_modules/zone.js/dist/zone.js?main=browser"></script>
17+
<script src="./../../node_modules/typescript/lib/typescript.js"></script>
18+
<script src="./../../node_modules/reflect-metadata/Reflect.js"></script>
19+
<script src="./../../node_modules/systemjs/dist/system.src.js"></script>
20+
<script src="./../../systemjs.config.js"></script>
1921
<!-- Ignite UI Required Combined JavaScript Files -->
2022
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
2123
<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.dv.js"></script>
@@ -24,19 +26,7 @@
2426
<link type="text/css" rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
2527
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css" />
2628
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
27-
<!-- 2. Configure SystemJS -->
2829
<script>
29-
System.config({
30-
transpiler: 'typescript',
31-
typescriptOptions: {
32-
emitDecoratorMetadata: true
33-
},
34-
packages: {
35-
'app': {
36-
defaultExtension: 'ts'
37-
}
38-
}
39-
});
4030
System.import('app.ts')
4131
.then(null, console.error.bind(console));
4232
</script>

0 commit comments

Comments
 (0)