Merge remote-tracking branch 'upstream/master'

Author: dkamburov

dist/npm/README.md

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "igniteui-angular2",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description" : "A packaged version of IgniteUI components for Angular2",
   "license": "MIT",
   "repository": {
@@ -22,12 +22,24 @@
     "data grids"
   ],
   "dependencies": {
-    "angular2": "2.0.0-beta.14",
-    "systemjs": "0.19.25",
+    "@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.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.6.6"
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.6",
+    "zone.js": "^0.6.12",
+
+	"angular2-in-memory-web-api": "0.0.12",
+    "bootstrap": "^3.3.6"
   },
   "devDependencies": {},
   "scripts": {}

package.json

@@ -7,23 +7,23 @@
     "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",
+	"angular2-in-memory-web-api": "0.0.12",
     "bootstrap": "^3.3.6"
   },
   "devDependencies": {

systemjs.config.js

@@ -1,5 +1,5 @@
 (function(global) {
-  var ngVer = '@2.0.0-rc.1';
+  var ngVer = '@2.0.0-rc.3';
   // map tells the System loader where to look for things
   var map = {
     'app':                        'app', // 'dist',