Merge branch 'release/2.0.1'

Author: rohitkr

dist/dist/index.js

@@ -59,7 +59,12 @@ var FusionChartsService = /** @class */ (function () {
     FusionChartsService.prototype.getFusionChartsStatic = function () {
         return this._fusionchartsStatice;
     };
+    FusionChartsService.prototype.getNextItemCount = function () {
+        FusionChartsService.itemCount++;
+        return FusionChartsService.itemCount;
+    };
     FusionChartsService._fcRoot = null;
+    FusionChartsService.itemCount = 0;
     FusionChartsService.decorators = [
         { type: _angular_core.Injectable },
     ];
@@ -416,6 +421,7 @@ var FusionChartsComponent = /** @class */ (function () {
         };
         this.element = element;
         this.fusionchartsService = fusionchartsService;
+        this.containerId = fusionchartsService.getNextItemCount();
     }
     // @ViewChild('samplediv') chartContainer: ElementRef;
     FusionChartsComponent.prototype.ngOnInit = function () {
@@ -465,22 +471,37 @@ var FusionChartsComponent = /** @class */ (function () {
             this.chartObj.chartType(this.type);
         }
     };
-    FusionChartsComponent.prototype.attachChartEventListener = function (chartObj, eventName) {
-        var _this_1 = this;
-        chartObj.addEventListener(eventName, function (eventObj, dataObj) {
-            var fEventObj = { eventObj: {}, dataObj: {} };
-            if (eventObj)
-                fEventObj.eventObj = eventObj;
-            if (dataObj)
-                fEventObj.dataObj = dataObj;
-            _this_1[eventName].emit(fEventObj);
+    /*
+    // Removed as some events will be fired
+    attachChartEventListener(chartObj: any, eventName: string){
+        chartObj.addEventListener(eventName, (eventObj:any, dataObj:any) => {
+            let fEventObj:FusionChartsEvent = { eventObj:{}, dataObj:{} };
+            if(eventObj) fEventObj.eventObj  = eventObj;
+            if(dataObj) fEventObj.dataObj = dataObj;
+            this[eventName].emit(fEventObj);
         });
-    };
-    FusionChartsComponent.prototype.attachAllChartEvents = function (chartObj, eventList$$1) {
+    }
+
+    attachAllChartEvents(chartObj:any, eventList:Array<string>){
+        eventList.forEach(eventName => {
+            this.attachChartEventListener(chartObj, eventName);
+        });
+    }
+    */
+    FusionChartsComponent.prototype.generateEventsCallback = function (eventList$$1) {
         var _this_1 = this;
+        var events = {};
         eventList$$1.forEach(function (eventName) {
-            _this_1.attachChartEventListener(chartObj, eventName);
+            events[eventName] = function (eventObj, dataObj) {
+                var fEventObj = { eventObj: {}, dataObj: {} };
+                if (eventObj)
+                    fEventObj.eventObj = eventObj;
+                if (dataObj)
+                    fEventObj.dataObj = dataObj;
+                _this_1[eventName].emit(fEventObj);
+            };
         });
+        return events;
     };
     FusionChartsComponent.prototype.ngAfterViewInit = function () {
         var _this = this, params = _this.constructerParams, configObj = _this.configObj || (_this.configObj = {});
@@ -496,13 +517,19 @@ var FusionChartsComponent = /** @class */ (function () {
             }
         }
         if (configObj['type']) {
+            var events = _this.generateEventsCallback(_this.eventList);
+            if (!configObj['events']) {
+                configObj['events'] = events;
+            }
+            else {
+                configObj['events'] = Object.assign(events, configObj['events']);
+            }
             _this.chartObj = FusionChartsConstructor(_this.fusionchartsService, configObj);
             this.initialized.emit({ chart: _this.chartObj });
             // configObj['renderAt'] = 'container-' + _this.chartObj.id;
             // _this.containerId = _this.chartObj.id;
             this.zone.runOutsideAngular(function () {
                 setTimeout(function () {
-                    _this.attachAllChartEvents(_this.chartObj, _this.eventList);
                     _this.chartObj.render(_this.element.nativeElement.querySelector('div'));
                 }, 1);
             });

dist/dist/index.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-fusioncharts",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/fusioncharts/angular-fusioncharts"

dist/package.json

@@ -218,8 +218,7 @@ declare class FusionChartsComponent implements OnInit, OnChanges, DoCheck, After
     updateWidth(): void;
     updateHeight(): void;
     updateType(): void;
-    attachChartEventListener(chartObj: any, eventName: string): void;
-    attachAllChartEvents(chartObj: any, eventList: Array<string>): void;
+    generateEventsCallback(eventList: Array<string>): {};
     ngAfterViewInit(): void;
     ngOnDestroy(): void;
 }

dist/src/fusioncharts.component.d.ts

@@ -4,11 +4,13 @@ export declare class FusionChartsStatic {
 }
 export declare class FusionChartsService {
     static _fcRoot: any;
+    static itemCount: any;
     _fusionchartsStatice: FusionChartsStatic;
     static setFCRoot(fcRoot: any): void;
     static getFCRoot(): any;
     static isFCRootSet(): boolean;
     constructor(FCStatic: FusionChartsStatic);
     resolveFusionCharts(core: any, modules: any[]): void;
     getFusionChartsStatic(): FusionChartsStatic;
+    getNextItemCount(): any;
 }