Merge remote-tracking branch 'refs/remotes/IgniteUI/master'

Author: MayaKirova

.gitignore

@@ -31,3 +31,28 @@ node_modules
 
 # Optional REPL history
 .node_repl_history
+
+# Typings
+typings
+
+# Typescript output
+app/*.d.ts
+app/*.js
+app/*.js.map
+
+samples/**/*.d.ts
+samples/**/*.js
+samples/**/*.js.map
+
+src/igniteui.angular2.d.ts
+src/*.js
+src/*.js.map
+
+tests/unit/**/*.d.ts
+tests/unit/**/*.js
+tests/unit/**/*.js.map
+
+# Build:
+dist/npm
+!dist/npm/README.md
+!dist/npm/package.json

.travis.yml

@@ -1,11 +1,29 @@
 language: node_js
 node_js:
-  - "5"
+- '5'
 before_install:
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - sleep 3
+- export CHROME_BIN=chromium-browser
+- export DISPLAY=:99.0
+- sh -e /etc/init.d/xvfb start
+- sleep 3
 script:
-  - npm run test
-  - cat ./coverage/lcov.info | coveralls
+- npm run test
+- cat ./coverage/lcov.info | coveralls
+
+before_deploy:
+# package and navigate to dist
+- npm run bundle
+- cd dist/npm
+# update package version
+- npm version "$TRAVIS_TAG" --no-git-tag-version --save
+
+deploy:
+  provider: npm
+  skip_cleanup: true
+  email: [email protected]
+  api_key:
+    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=
+  on:
+    tags: true
+    repo: IgniteUI/igniteui-angular2
+    branch: master

README.md

@@ -2,6 +2,7 @@
 
 [![NPM version](https://img.shields.io/npm/v/igniteui-angular2.svg?style=flat)](https://www.npmjs.com/package/igniteui-angular2)
 [![Build Status](https://travis-ci.org/IgniteUI/igniteui-angular2.svg?branch=master)](https://travis-ci.org/IgniteUI/igniteui-angular2)
+[![Issue Stats](http://issuestats.com/github/IgniteUI/igniteui-angular2/badge/pr?style=flat)](http://issuestats.com/github/IgniteUI/igniteui-angular2)
 [![Coverage Status](https://coveralls.io/repos/github/IgniteUI/igniteui-angular2/badge.svg?branch=master)](https://coveralls.io/github/IgniteUI/igniteui-angular2?branch=master)
 
 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/boot.js

@@ -73,6 +73,42 @@ There are two mandatory attributes that need to be set to an Ignite UI control c
 
 In this example `options` attribute points to `gridOptions` property on the application compoment class and `widgetId` points to the `id` property.
 
+### Configuring Top Level Control Options
+
+All top level options are allowed to be set as attributes of an Ignite UI control custom tag. In this case `options` attribute is not mandatory,
+but it is allowed. And if both - `options` and top-level attributes are combined, top-level attributes will override `options`,
+when there are overlapping properties. Also changing top-level attribute will apply the change to the widget, only if the option is settable.
+
+#### Example:
+
+    @Component({
+        selector: 'my-app',
+        template: `<ig-grid
+            [widgetId]='id'
+            [width]='w'
+            [autoCommit]='true'
+            [dataSource]='data'
+            [height]='h'
+            [autoGenerateColumns]='true'
+            >
+        </ig-grid>`,
+        directives: [IgGridComponent]
+    })
+    export class AppComponent {
+        private id: string;
+        private data: any;
+        private w: string;
+        private h: string;
+        private pKey: string;
+
+        constructor() {
+            this.data = Northwind.getData();
+            this.id ='grid1';
+            this.w = '100%';
+            this.h = '400px';
+            this.pKey = 'ProductID';
+        }
+    }
 
 ### Handling events
 

dist/npm/README.md

@@ -1,8 +1,9 @@
 {
   "name": "igniteui-angular2",
-  "version": "1.0.0",
-  "description" : "A packaged version of IgniteUI components for Angular2",
+  "version": "1.0.2",
+  "description" : "A packaged version of Ignite UI components for Angular2",
   "license": "MIT",
+  "typings": "igniteui.angular2.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/IgniteUI/igniteui-angular2.git"
@@ -21,14 +22,9 @@
     "data visualization",
     "data grids"
   ],
-  "dependencies": {
-    "angular2": "2.0.0-beta.14",
-    "systemjs": "0.19.25",
-    "es6-shim": "^0.35.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.6.6"
-  },
-  "devDependencies": {},
-  "scripts": {}
+  "peerDependencies": {
+    "@angular/common":  "2.0.0-rc.3",
+    "@angular/core":  "2.0.0-rc.3",
+    "reflect-metadata": "^0.1.3"
+  }
 }

dist/npm/package.json

@@ -16,11 +16,11 @@
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
 	<script src="https://npmcdn.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
 
-	<script src="./../node_modules/zone.js/dist/zone.js"></script>
-	<script src="./../node_modules/typescript/lib/typescript.js"></script>
-	<script src="./../node_modules/reflect-metadata/Reflect.js"></script>
-	<script src="./../node_modules/systemjs/dist/system.js"></script>
-	<script src="./../systemjs.config.js"></script>
+	<script src="https://npmcdn.com/zone.js@0.6.12?main=browser"></script>
+	<script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>
+	<script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
+	<script src="https://npmcdn.com/[email protected]/dist/system.src.js"></script>
+	<script src="./systemjs.config.js"></script>
 
 	<!-- Ignite UI Required Combined JavaScript Files -->
 	<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>
@@ -32,7 +32,7 @@
 	<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 
 	<script>
-		System.import('app/boot')
+		System.import('app/boot.ts')
 			.then(null, console.error.bind(console));
 	</script>
 

index.html

@@ -7,23 +7,22 @@
     "url": "https://github.com/IgniteUI/igniteui-angular2.git"
   },
   "dependencies": {
-    "@angular/common":  "2.0.0-rc.1",
-    "@angular/compiler":  "2.0.0-rc.1",
-    "@angular/core":  "2.0.0-rc.1",
-    "@angular/http":  "2.0.0-rc.1",
-    "@angular/platform-browser":  "2.0.0-rc.1",
-    "@angular/platform-browser-dynamic":  "2.0.0-rc.1",
-    "@angular/router":  "2.0.0-rc.1",
-    "@angular/router-deprecated":  "2.0.0-rc.1",
-    "@angular/upgrade":  "2.0.0-rc.1",
+    "@angular/common":  "2.0.0-rc.3",
+    "@angular/compiler":  "2.0.0-rc.3",
+    "@angular/core":  "2.0.0-rc.3",
+    "@angular/http":  "2.0.0-rc.3",
+    "@angular/platform-browser":  "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic":  "2.0.0-rc.3",
+    "@angular/router":  "2.0.0-rc.2",
+    "@angular/router-deprecated":  "2.0.0-rc.2",
+    "@angular/upgrade":  "2.0.0-rc.3",
 
     "systemjs": "0.19.27",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "^0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.12",
-
-	"angular2-in-memory-web-api": "0.0.7",
+    
     "bootstrap": "^3.3.6"
   },
   "devDependencies": {
@@ -49,8 +48,9 @@
     "lite": "lite-server",
 
     "watch": "node node_modules/typescript/bin/tsc -w",
-    "build": "node node_modules/typescript/bin/tsc && npm run prepare-dist",
-    "prepare-dist": "cp src/igniteui.angular2.js dist/npm/ && cp src/igniteui.d.ts dist/npm/ && cp src/jquery.d.ts dist/npm/",
+    "build": "node node_modules/typescript/bin/tsc",
+    "bundle": "node node_modules/typescript/bin/tsc -d && npm run prepare-dist",
+    "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/",
 
     "pretest": "npm run build",
     "test": "karma start tests/karma.conf.js && npm run remap-istanbul",

package.json

@@ -12,7 +12,7 @@
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" type="text/css" />
 	<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" type="text/css"
 	/>
-	<link rel="stylesheet" href="/samples/sample.css" />
+	<link rel="stylesheet" href="../sample.css" />
 
 	<link type="text/css" href="//cdn-na.infragistics.com/igniteui/latest/css/structure/modules/infragistics.ui.validator.css"
 		rel="stylesheet" />
@@ -63,10 +63,10 @@
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
 	<script src="https://npmcdn.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
 
-	<script src="./../../node_modules/zone.js/dist/zone.js?main=browser"></script>
-	<script src="./../../node_modules/typescript/lib/typescript.js"></script>
-	<script src="./../../node_modules/reflect-metadata/Reflect.js"></script>
-	<script src="./../../node_modules/systemjs/dist/system.src.js"></script>
+	<script src="https://npmcdn.com/zone.js@0.6.12?main=browser"></script>
+	<script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>
+	<script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
+	<script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
 	<script src="./../../systemjs.config.js"></script>
 
 	<!-- Ignite UI Required Combined JavaScript Files -->

samples/igCombo/igCombo.html

@@ -13,10 +13,10 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.20/system-polyfills.js"></script>
 	<script src="https://npmcdn.com/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
 
-	<script src="./../../node_modules/zone.js/dist/zone.js?main=browser"></script>
-	<script src="./../../node_modules/typescript/lib/typescript.js"></script>
-	<script src="./../../node_modules/reflect-metadata/Reflect.js"></script>
-	<script src="./../../node_modules/systemjs/dist/system.src.js"></script>
+	<script src="https://npmcdn.com/zone.js@0.6.12?main=browser"></script>
+	<script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>
+	<script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
+	<script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
 	<script src="./../../systemjs.config.js"></script>
 	<!-- Ignite UI Required Combined JavaScript Files -->
 	<script src="http://cdn-na.infragistics.com/igniteui/latest/js/infragistics.core.js"></script>