Skip to content

Commit 5166967

Browse files
dkamburovdkamburov
committed
Improve complex object templating and fix it for rc5
2 parents 5ced14c + 8e3914e commit 5166967

File tree

55 files changed

+577
-473
lines changed

Some content is hidden

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

55 files changed

+577
-473
lines changed

‎.gitignore‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,28 @@ node_modules
3131

3232
# Optional REPL history
3333
.node_repl_history
34+
35+
# Typings
36+
typings
37+
38+
# Typescript output
39+
app/*.d.ts
40+
app/*.js
41+
app/*.js.map
42+
43+
samples/**/*.d.ts
44+
samples/**/*.js
45+
samples/**/*.js.map
46+
47+
src/igniteui.angular2.d.ts
48+
src/*.js
49+
src/*.js.map
50+
51+
tests/unit/**/*.d.ts
52+
tests/unit/**/*.js
53+
tests/unit/**/*.js.map
54+
55+
# Build:
56+
dist/npm
57+
!dist/npm/README.md
58+
!dist/npm/package.json

‎.travis.yml‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,29 @@
11
language: node_js
22
node_js:
3-
- "5"
3+
- '5'
44
before_install:
5-
- export CHROME_BIN=chromium-browser
6-
- export DISPLAY=:99.0
7-
- sh -e /etc/init.d/xvfb start
8-
- sleep 3
5+
- export CHROME_BIN=chromium-browser
6+
- export DISPLAY=:99.0
7+
- sh -e /etc/init.d/xvfb start
8+
- sleep 3
99
script:
10-
- npm run test
11-
- cat ./coverage/lcov.info | coveralls
10+
- npm run test
11+
- cat ./coverage/lcov.info | coveralls
12+
13+
before_deploy:
14+
# package and navigate to dist
15+
- npm run bundle
16+
- cd dist/npm
17+
# update package version
18+
- npm version "$TRAVIS_TAG" --no-git-tag-version --save
19+
20+
deploy:
21+
provider: npm
22+
skip_cleanup: true
23+
email: [email protected]
24+
api_key:
25+
secure: Zu/eJ0WMio4dVw5NyF1VE7OjkOYhUW+2m5SDfmlJ226Ra7QoTJaj69DEOH13JR3161z1RKHqguLgkTfaXwT9NCaf1zAOn6Qhk0bf0GR52OvfypTaeaXdHnMvTaL3Y/O7xHNLlcnPfS/iq+6/D0TbDmsDwdXG8tKPRXFcEsouV+YXwGZuXWvkYFM8MJ2o0W5w3Z/T4JZ6adKER0tU0IhbkDeep1GNUXH3c+GLtIovQdb2Brz8y++4C7WTsy206XQDLFP3tFqCIaKOs8sVXdL5/SjOeQdEr1KkrVuVy25edAHryODm6L2BS0AUGXBYO5n+Ozb8ekJ9NtusDQVfuNZoFDoMUbSMupXcTutKHN51+FI/8SecLzRn3aL6/1Zk/gnI04sp/bdPH2Luc7tOhcsm9edsN1ojsTA9Lbbfa0iIlsKkulHLp35rpzfTLSlI2CYoT9a4mvj9idknKxXMCKJiC/ZK6P4PMiMKLaQAk1Mbg+6TLfA1SpFnhH+HNeLAmGMwWPnsCQmOQbKWeh0/8v0R58bFfTlswPrzPFsghnh/+K4fLQCOe1TwOwtwJyc3WK7csGAbNFg7AjlxvSia8MpJQ5p1IDLRDtHHt3qcoxJqwcIpwxSFayPW6L9mjwUCfnUxEl37Qnz4gbelijZtw99+FgUmDJ+xjXnHC9JMqfxMWrQ=
26+
on:
27+
tags: true
28+
repo: IgniteUI/igniteui-angular2
29+
branch: master

‎app/boot.js‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎dist/npm/package.json‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
{
22
"name": "igniteui-angular2",
33
"version": "1.0.2",
4-
"description" : "A packaged version of IgniteUI components for Angular2",
4+
"description" : "A packaged version of Ignite UI components for Angular2",
55
"license": "MIT",
6+
"typings": "igniteui.angular2.d.ts",
67
"repository": {
78
"type": "git",
89
"url": "https://github.com/IgniteUI/igniteui-angular2.git"
@@ -21,26 +22,9 @@
2122
"data visualization",
2223
"data grids"
2324
],
24-
"dependencies": {
25+
"peerDependencies": {
2526
"@angular/common": "2.0.0-rc.3",
26-
"@angular/compiler": "2.0.0-rc.3",
2727
"@angular/core": "2.0.0-rc.3",
28-
"@angular/http": "2.0.0-rc.3",
29-
"@angular/platform-browser": "2.0.0-rc.3",
30-
"@angular/platform-browser-dynamic": "2.0.0-rc.3",
31-
"@angular/router": "2.0.0-rc.2",
32-
"@angular/router-deprecated": "2.0.0-rc.2",
33-
"@angular/upgrade": "2.0.0-rc.3",
34-
35-
"systemjs": "0.19.27",
36-
"es6-shim": "^0.35.0",
37-
"reflect-metadata": "^0.1.3",
38-
"rxjs": "5.0.0-beta.6",
39-
"zone.js": "^0.6.12",
40-
41-
"angular2-in-memory-web-api": "0.0.12",
42-
"bootstrap": "^3.3.6"
43-
},
44-
"devDependencies": {},
45-
"scripts": {}
28+
"reflect-metadata": "^0.1.3"
29+
}
4630
}

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,22 @@
77
"url": "https://github.com/IgniteUI/igniteui-angular2.git"
88
},
99
"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",
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.3",
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

26-
"angular2-in-memory-web-api": "0.0.12",
2726
"bootstrap": "^3.3.6"
2827
},
2928
"devDependencies": {
@@ -49,8 +48,9 @@
4948
"lite": "lite-server",
5049

5150
"watch": "node node_modules/typescript/bin/tsc -w",
52-
"build": "node node_modules/typescript/bin/tsc && npm run prepare-dist",
53-
"prepare-dist": "cp src/igniteui.angular2.js dist/npm/ && cp src/igniteui.d.ts dist/npm/ && cp src/jquery.d.ts dist/npm/",
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/",
5454

5555
"pretest": "npm run build",
5656
"test": "karma start tests/karma.conf.js && npm run remap-istanbul",

‎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-ComplexOpts/app.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ declare var jQuery: any;
99
@Component({
1010
selector: 'my-app',
1111
templateUrl: "./igGrid-ComplexOptsTemplate.html",
12-
directives: [IgGridComponent, Column, Feature, FORM_DIRECTIVES]
12+
directives: [FORM_DIRECTIVES, IgGridComponent, Column, Feature ]
1313
})
1414
export class AppComponent {
1515
private cols: Array<any>;

‎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/igHierarchicalGrid/igHierarchicalGrid.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h1 class="push-down-md"><a href="http://igniteui.com/hierarchical-grid/overview
4040
<div class="row description">
4141
<div class="col-md-12">
4242
<p class="lead">This sample demonstrates how AngularJS components are used to instantiate igHierarchicalGrid.</p>
43-
<p><a href="https://github.com/IgniteUI/igniteui-angular/blob/master/samples/igHierarchicalGrid/igHierarchicalGrid.html" class="btn btn-default btn-lg btn-primary" target="_blank"><i class="fa fa-code fa-lg"></i> Explore the Code</a></p>
43+
<p><a href="https://github.com/IgniteUI/igniteui-angular2/blob/master/samples/igHierarchicalGrid/igHierarchicalGrid.html" class="btn btn-default btn-lg btn-primary" target="_blank"><i class="fa fa-code fa-lg"></i> Explore the Code</a></p>
4444
</div>
4545
</div>
4646

0 commit comments

Comments
 (0)