Skip to content

Commit 8e3914e

Browse files
kdinevkdinev
authored
Merge pull request #75 from dkamburov/rc5
Update repo to RC 5
2 parents 40b0e7e + a9683f2 commit 8e3914e

File tree

14 files changed

+54
-45
lines changed

14 files changed

+54
-45
lines changed

‎package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
"url": "https://github.com/IgniteUI/igniteui-angular2.git"
88
},
99
"dependencies": {
10-
"@angular/common": "2.0.0-rc.4",
11-
"@angular/compiler": "2.0.0-rc.4",
12-
"@angular/core": "2.0.0-rc.4",
13-
"@angular/http": "2.0.0-rc.4",
14-
"@angular/platform-browser": "2.0.0-rc.4",
15-
"@angular/platform-browser-dynamic": "2.0.0-rc.4",
16-
"@angular/router": "2.0.0-rc.2",
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",
1717
"@angular/router-deprecated": "2.0.0-rc.2",
18-
"@angular/upgrade": "2.0.0-rc.4",
18+
"@angular/upgrade": "2.0.0-rc.5",
1919

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

2626
"bootstrap": "^3.3.6"
2727
},

‎samples/igCombo/app.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
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 '@angular/platform-browser-dynamic'
4+
import {bootstrap } from '@angular/platform-browser-dynamic';
5+
import { FORM_DIRECTIVES } from '@angular/common';
56

67
declare var jQuery: any;
78
@Component({
89
selector: 'my-app',
910
templateUrl: "./igComboTemplate.html",
10-
directives: [IgComboComponent]
11+
directives: [FORM_DIRECTIVES, IgComboComponent]
1112
})
1213
export class AppComponent {
13-
private options: IgCombo;
14-
private northwind: any;
15-
private combo: any;
14+
public options: IgCombo;
15+
public northwind: any;
16+
public combo: any;
1617

1718
constructor() {
1819
this.northwind = Northwind.getData();

‎samples/igEditors/app.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
22
import {IgCurrencyEditorComponent, IgDateEditorComponent, IgMaskEditorComponent, IgNumericEditorComponent,
33
IgPercentEditorComponent, IgTextEditorComponent, IgDatePickerComponent} from "../../src/igniteui.angular2.ts";
4+
import { FORM_DIRECTIVES } from '@angular/common';
45
import {bootstrap } from '@angular/platform-browser-dynamic'
56

67
declare var jQuery: any;
78
@Component({
89
selector: 'my-app',
910
templateUrl: `../igEditors/igEditorsTemplate.html`,
10-
directives: [IgCurrencyEditorComponent, IgDateEditorComponent, IgMaskEditorComponent, IgNumericEditorComponent,
11+
directives: [FORM_DIRECTIVES, IgCurrencyEditorComponent, IgDateEditorComponent, IgMaskEditorComponent, IgNumericEditorComponent,
1112
IgPercentEditorComponent, IgTextEditorComponent, IgDatePickerComponent]
1213
})
1314
export class AppComponent {

‎samples/igGrid/app.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import {Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
22
import {IgGridComponent} from "../../src/igniteui.angular2.ts";
3+
import { FORM_DIRECTIVES } from '@angular/common';
34
import {Northwind} from "./../data/northwind.ts";
45
import {bootstrap } from '@angular/platform-browser-dynamic';
56

7+
68
declare var jQuery: any;
79
@Component({
810
selector: 'my-app',
911
templateUrl: "./igGridTemplate.html",
10-
directives: [IgGridComponent]
12+
directives: [FORM_DIRECTIVES, IgGridComponent]
1113
})
1214
export class AppComponent {
1315
private gridOptions: IgGrid;

‎samples/igHtmlEditor/app.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
2-
import {IgHtmlEditorComponent } from "../../src/igniteui.angular2.ts";
3-
import {bootstrap } from '@angular/platform-browser-dynamic'
2+
import { IgHtmlEditorComponent } from "../../src/igniteui.angular2.ts";
3+
import { bootstrap } from '@angular/platform-browser-dynamic';
4+
import { FORM_DIRECTIVES } from '@angular/common';
45

56
declare var jQuery: any;
67
@Component({
78
selector: 'my-app',
89
templateUrl: `../igHtmlEditor/igHtmlEditorTemplate.html`,
9-
directives: [IgHtmlEditorComponent]
10+
directives: [FORM_DIRECTIVES, IgHtmlEditorComponent]
1011
})
1112
export class AppComponent {
1213
private options: any;

‎samples/igTree/app.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { Component, Inject, ElementRef, EventEmitter, HostListener} from '@angular/core';
22
import { IgTreeComponent} from "../../src/igniteui.angular2.ts";
3+
import { FORM_DIRECTIVES } from '@angular/common';
34
import {bootstrap } from '@angular/platform-browser-dynamic'
45
import {ProductCategories} from "./../data/product-categories.ts";
56
declare var jQuery: any;
67
@Component({
78
selector: 'my-app',
89
templateUrl:"../igTree/igTreeTemplate.html",
9-
directives: [IgTreeComponent]
10+
directives: [FORM_DIRECTIVES, IgTreeComponent]
1011
})
1112
export class AppComponent {
1213
protected options: IgTree;
@@ -30,16 +31,16 @@ export class AppComponent {
3031
bindings: {
3132
childDataProperty : "ProductSubcategories",
3233
textKey : "Name",
33-
valueKey : "ProductCategoryID"
34+
valueKey : "ProductCategoryID"
3435
}
3536
};
3637
}
3738

3839
addNodeRootLevel(){
39-
this.data.push({"Name": "New Node", "ProductCategoryID": this.data.length + 1, "ProductSubcategories":[] });
40+
this.data.push({"Name": "New Node", "ProductCategoryID": this.data.length + 1, "ProductSubcategories":[] });
4041
this.newProductCategory.ProductCategoryID = this.data.length + 1;
4142
}
42-
addProductCategory(){
43+
addProductCategory(){
4344
this.data.push(JSON.parse(JSON.stringify(this.newProductCategory)));
4445
this.newProductCategory.ProductCategoryID = this.data.length + 1;
4546

‎systemjs.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(function(global) {
2-
var ngVer = '@2.0.0-rc.4';
2+
var ngVer = '@2.0.0-rc.5';
33
// map tells the System loader where to look for things
44
var map = {
55
'app': 'app', // 'dist',

‎tests/unit/igbulletgraph/bulletgraph.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
// modeled after https://github.com/angular/angular/blob/cee2318110eeea115e5f6fc5bfc814cbaa7d90d8/modules/angular2/test/common/directives/ng_for_spec.ts
3-
import { inject, beforeEachProviders, TestComponentBuilder } from '@angular/core/testing';
3+
import { inject, TestComponentBuilder } from '@angular/core/testing';
44
import { Component, ViewChild, TemplateRef } from '@angular/core';
55
import * as Infragistics from '../../../src/igniteui.angular2';
66

‎tests/unit/igcombo/combo.spec.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// modeled after https://github.com/angular/angular/blob/cee2318110eeea115e5f6fc5bfc814cbaa7d90d8/modules/angular2/test/common/directives/ng_for_spec.ts
22
import { inject, addProviders, TestComponentBuilder } from '@angular/core/testing';
33
import { Component, ViewChild, TemplateRef } from '@angular/core';
4+
import { FORM_DIRECTIVES } from '@angular/common';
45
import * as Infragistics from '../../../src/igniteui.angular2';
56
import { Northwind } from "../../../samples/data/northwind";
67

@@ -76,12 +77,12 @@ export function main() {
7677
@Component({
7778
selector: 'test-cmp',
7879
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
79-
directives: [Infragistics.IgComboComponent]
80+
directives: [FORM_DIRECTIVES, Infragistics.IgComboComponent]
8081
})
8182
class TestComponent {
8283
private options: IgCombo;
83-
private northwind: any;
84-
private combo: any;
84+
public northwind: any;
85+
public combo: any;
8586
private comboID: string
8687
private cdi = 10;
8788
@ViewChild(Infragistics.IgComboComponent) public viewChild: Infragistics.IgComboComponent;

‎tests/unit/igeditors/editors.spec.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// modeled after https://github.com/angular/angular/blob/cee2318110eeea115e5f6fc5bfc814cbaa7d90d8/modules/angular2/test/common/directives/ng_for_spec.ts
22
import { inject, TestComponentBuilder } from '@angular/core/testing';
33
import {Component, ViewChild, TemplateRef} from '@angular/core';
4+
import { FORM_DIRECTIVES } from '@angular/common';
45
import * as Infragistics from '../../../src/igniteui.angular2';
56

67
export function main() {
@@ -290,7 +291,7 @@ export function main() {
290291
@Component({
291292
selector: 'test-text-editor-cmp',
292293
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
293-
directives: [Infragistics.IgTextEditorComponent]
294+
directives: [FORM_DIRECTIVES, Infragistics.IgTextEditorComponent]
294295
})
295296
class TestIgTextEditorComponent {
296297
private opts: IgTextEditor;
@@ -311,7 +312,7 @@ class TestIgTextEditorComponent {
311312
@Component({
312313
selector: 'test-numeric-editor-cmp',
313314
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
314-
directives: [Infragistics.IgNumericEditorComponent]
315+
directives: [FORM_DIRECTIVES, Infragistics.IgNumericEditorComponent]
315316
})
316317
class TestIgNumericEditorComponent {
317318
private val:number;
@@ -328,7 +329,7 @@ class TestIgNumericEditorComponent {
328329
@Component({
329330
selector: 'test-percent-editor-cmp',
330331
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
331-
directives: [Infragistics.IgPercentEditorComponent]
332+
directives: [FORM_DIRECTIVES, Infragistics.IgPercentEditorComponent]
332333
})
333334
class TestIgPercentEditorComponent {
334335
private val:number;
@@ -344,7 +345,7 @@ class TestIgPercentEditorComponent {
344345
@Component({
345346
selector: 'test-mask-editor-cmp',
346347
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
347-
directives: [Infragistics.IgMaskEditorComponent]
348+
directives: [FORM_DIRECTIVES, Infragistics.IgMaskEditorComponent]
348349
})
349350
class TestIgMaskEditorComponent {
350351
private val:string;
@@ -360,7 +361,7 @@ class TestIgMaskEditorComponent {
360361
@Component({
361362
selector: 'test-date-picker-cmp',
362363
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
363-
directives: [Infragistics.IgDatePickerComponent]
364+
directives: [FORM_DIRECTIVES, Infragistics.IgDatePickerComponent]
364365
})
365366
class TestIgDatePickerComponent {
366367
private val: Date;
@@ -376,7 +377,7 @@ class TestIgDatePickerComponent {
376377
@Component({
377378
selector: 'test-date-editor-cmp',
378379
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
379-
directives: [Infragistics.IgDateEditorComponent]
380+
directives: [FORM_DIRECTIVES, Infragistics.IgDateEditorComponent]
380381
})
381382
class TestIgDateEditorComponent {
382383
private val: Date;
@@ -392,7 +393,7 @@ class TestIgDateEditorComponent {
392393
@Component({
393394
selector: 'test-currency-editor-cmp',
394395
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
395-
directives: [Infragistics.IgCurrencyEditorComponent]
396+
directives: [FORM_DIRECTIVES, Infragistics.IgCurrencyEditorComponent]
396397
})
397398
class TestIgCurrencyEditorComponent {
398399
private val: number;
@@ -408,7 +409,7 @@ class TestIgCurrencyEditorComponent {
408409
@Component({
409410
selector: 'test-checkbox-editor-cmp',
410411
template: '<div></div>', //"Component 'TestComponent' must have either 'template' or 'templateUrl' set."
411-
directives: [Infragistics.IgCheckboxEditorComponent]
412+
directives: [FORM_DIRECTIVES, Infragistics.IgCheckboxEditorComponent]
412413
})
413414
class TestIgCheckboxEditorComponent {
414415
private val: boolean;

0 commit comments

Comments
 (0)