Fixed bug multiple chart

hendrathings · Jan 14, 2017 · 560837a · 560837a
1 parent 6a9d9eb
commit 560837a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -14,10 +14,10 @@ If you are using nvd3 for angular2.RC take a look [ng2-nvd3](https://github.com/
 
 This node use some dependency of [@types](https://github.com/DefinitelyTyped/DefinitelyTyped) :
 
-- @types/nvd3
-- @types/d3
-- d3
-- nvd3
+- @types/nvd3@^1.8.33
+- @types/d3@^3.5.35
+- d3@^3.5.17
+- nvd3@^1.8.5
 
 Most of people get chart background turn into black, make sure to include `nvd3.css` via transpiler `webpack` or `systemjs` or what your transpiler.
 
@@ -145,10 +145,3 @@ you can set your callback:
 
 you rock....!!!
 
-## Change Log
-
-### 1.0.1 (master)
-
-- Angular2 - v2.4.1
-
-
diff --git a/dist/angular2-nvd3/angular2-nvd3.component.js b/dist/angular2-nvd3/angular2-nvd3.component.js
@@ -13,7 +13,7 @@ var angular2_nvd3_core_1 = require("./angular2-nvd3.core");
 var NvD3Component = (function () {
     function NvD3Component(el) {
         this.el = el;
-        this.ngNvD3 = angular2_nvd3_core_1.Angular2NvD3.NgNvD3.getInstance(this.el);
+        this.ngNvD3 = new angular2_nvd3_core_1.Angular2NvD3.NgNvD3(this.el);
     }
     NvD3Component.prototype.ngOnChanges = function () {
         this.ngNvD3.updateWithOptions(this.options, this.data);

diff --git a/dist/angular2-nvd3/angular2-nvd3.core.d.ts b/dist/angular2-nvd3/angular2-nvd3.core.d.ts
@@ -4,9 +4,7 @@ export declare namespace Angular2NvD3 {
         private chart;
         private svg;
         private viewInitialize;
-        private static instance;
         constructor(el: any);
-        static getInstance(el: any): NgNvD3;
         isViewInitialize(value: boolean): void;
         updateWithOptions(options: any, data: any): void;
         private updateWithData(data, options);

diff --git a/dist/angular2-nvd3/angular2-nvd3.core.js b/dist/angular2-nvd3/angular2-nvd3.core.js
@@ -8,12 +8,6 @@ var Angular2NvD3;
             this.viewInitialize = false;
             this.el = el;
         }
-        NgNvD3.getInstance = function (el) {
-            if (!NgNvD3.instance) {
-                NgNvD3.instance = new NgNvD3(el);
-            }
-            return NgNvD3.instance;
-        };
         NgNvD3.prototype.isViewInitialize = function (value) {
             this.viewInitialize = value;
         };

diff --git a/dist/angular2-nvd3/angular2-nvd3.directive.js b/dist/angular2-nvd3/angular2-nvd3.directive.js
@@ -13,7 +13,7 @@ var angular2_nvd3_core_1 = require("./angular2-nvd3.core");
 var NvD3Directive = (function () {
     function NvD3Directive(el) {
         this.el = el;
-        this.ngNvD3 = angular2_nvd3_core_1.Angular2NvD3.NgNvD3.getInstance(this.el);
+        this.ngNvD3 = new angular2_nvd3_core_1.Angular2NvD3.NgNvD3(this.el);
     }
     NvD3Directive.prototype.ngOnChanges = function () {
         this.ngNvD3.updateWithOptions(this.options, this.data);

diff --git a/src/angular2-nvd3/angular2-nvd3.component.ts b/src/angular2-nvd3/angular2-nvd3.component.ts
@@ -12,7 +12,7 @@ export class NvD3Component implements OnChanges, OnInit {
     private ngNvD3: any;
 
     constructor(private el: ElementRef) {
-        this.ngNvD3 = Angular2NvD3.NgNvD3.getInstance(this.el);
+        this.ngNvD3 = new Angular2NvD3.NgNvD3(this.el);
     }
 
     ngOnChanges() {

diff --git a/src/angular2-nvd3/angular2-nvd3.core.ts b/src/angular2-nvd3/angular2-nvd3.core.ts
@@ -8,19 +8,11 @@ export namespace Angular2NvD3 {
         private chart: any;
         private svg: any;
         private viewInitialize: boolean = false;
-        private static instance: NgNvD3;
 
         constructor(el) {
             this.el = el;
         }
 
-        static getInstance(el) {
-            if (!NgNvD3.instance) {
-                NgNvD3.instance = new NgNvD3(el);
-            }
-            return NgNvD3.instance;
-        }
-
         public isViewInitialize(value: boolean) {
             this.viewInitialize = value;
         }

diff --git a/src/angular2-nvd3/angular2-nvd3.directive.ts b/src/angular2-nvd3/angular2-nvd3.directive.ts
@@ -12,7 +12,7 @@ export class NvD3Directive implements OnChanges, OnInit {
     private ngNvD3: any;
 
     constructor(private el: ElementRef) {
-        this.ngNvD3 = Angular2NvD3.NgNvD3.getInstance(this.el);
+        this.ngNvD3 = new Angular2NvD3.NgNvD3(this.el);
     }
 
     ngOnChanges() {