Merge branch 'master' of github.com:500tech/angular-tree-component

adamkleingit · adamkleingit · commit 72ac6e84e483 · 2017-10-21T12:45:51.000+03:00
diff --git a/README.md b/README.md
@@ -48,8 +48,7 @@ git clone https://github.com/500tech/angular-tree-component
 
 cd angular-tree-component/example/cli
 npm install
-npm install -g angular-cli
-ng serve
+./node_modules/.bin/ng serve
 ```
 
 ## SystemJS
diff --git a/doc/index.html b/doc/index.html
@@ -105,8 +105,7 @@ <h2 id="example">Example</h2>
 
 <span class="hljs-keyword">cd</span> angular-tree-component/example/<span class="hljs-keyword">cli</span>
 npm install
-npm install -<span class="hljs-keyword">g</span> angular-<span class="hljs-keyword">cli</span>
-ng serve
+./node_modules/.bin/ng serve
 </code></pre><h2 id="systemjs">SystemJS</h2>
 				<p>Sorry guys, SystemJS is not supported.
 				Modern web applications use bundlers like Webpack.</p>
diff --git a/lib/defs/api.ts b/lib/defs/api.ts
@@ -231,6 +231,10 @@ export interface ITreeOptions {
      * This include direction, expander style, and change key binding (right key collapse and left key expands instead of vice-versa)
      */
     rtl?: boolean;
+    /**
+     * Specifies id of root node (virtualRoot)
+     */
+    rootId?: any;
  }
 
 export interface ITreeNode {
diff --git a/lib/models/tree-options.model.ts b/lib/models/tree-options.model.ts
@@ -82,6 +82,7 @@ export class TreeOptions {
   get animateAcceleration(): number { return this.options.animateAcceleration || 1.2; }
   get scrollOnSelect(): boolean { return this.options.scrollOnSelect === undefined ? true : this.options.scrollOnSelect; }
   get rtl(): boolean { return !!this.options.rtl; }
+  get rootId(): any {return this.options.rootId; }
   actionMapping: IActionMapping;
 
   constructor(private options: ITreeOptions = {}) {
diff --git a/lib/models/tree.model.ts b/lib/models/tree.model.ts
@@ -170,6 +170,7 @@ export class TreeModel implements ITreeModel {
   @action update() {
     // Rebuild tree:
     let virtualRootConfig = {
+      id: this.options.rootId,
       virtual: true,
       [this.options.childrenField]: this.nodes
     };
diff --git a/rollup.config.js b/rollup.config.js
@@ -13,6 +13,19 @@ export default {
   sourceMap: true,
   external: [
     '@angular/core',
-    '@angular/common'
-  ]
+    '@angular/common',
+    'lodash',
+    'mobx', 
+    'mobx-angular'
+  ],
+  onwarn: function (warning) {
+    // ignore spurious warnings about TS generated code such as __decorate, etc.
+    if (warning.code === 'THIS_IS_UNDEFINED' || warning.message.indexOf("The 'this' keyword is equivalent to 'undefined'") > -1) { 
+      return; 
+    }
+    
+    // console.warn everything else
+    console.warn( warning.message );
+  }
+
 };
