Skip to content

Commit 103001b

Browse files
committed
Fixed module installation
1 parent e9914d4 commit 103001b

11 files changed

+510
-494
lines changed

dist/dist/index.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ var FusionChartsService = /** @class */ (function () {
3838
return !!FusionChartsService._fcRoot;
3939
};
4040
FusionChartsService.prototype.resolveFusionCharts = function (core, modules) {
41-
if (core && core.id &&
42-
core.id === 'FusionCharts') {
41+
if (core && core.id && core.id === 'FusionCharts') {
4342
this._fusionchartsStatice = core;
4443
}
4544
else {
4645
this._fusionchartsStatice = core();
4746
}
4847
if (modules) {
4948
modules.forEach(function (FusionChartsModules) {
50-
if (FusionChartsModules.getName || FusionChartsModules.name) {
49+
if ((FusionChartsModules.getName && FusionChartsModules.getType) ||
50+
(FusionChartsModules.name && FusionChartsModules.type)) {
5151
core.addDep(FusionChartsModules);
5252
}
5353
else {
@@ -472,22 +472,22 @@ var FusionChartsComponent = /** @class */ (function () {
472472
}
473473
};
474474
/*
475-
// Removed as some events will be fired
476-
attachChartEventListener(chartObj: any, eventName: string){
477-
chartObj.addEventListener(eventName, (eventObj:any, dataObj:any) => {
478-
let fEventObj:FusionChartsEvent = { eventObj:{}, dataObj:{} };
479-
if(eventObj) fEventObj.eventObj = eventObj;
480-
if(dataObj) fEventObj.dataObj = dataObj;
481-
this[eventName].emit(fEventObj);
482-
});
483-
}
484-
485-
attachAllChartEvents(chartObj:any, eventList:Array<string>){
486-
eventList.forEach(eventName => {
487-
this.attachChartEventListener(chartObj, eventName);
488-
});
489-
}
490-
*/
475+
// Removed as some events will be fired
476+
attachChartEventListener(chartObj: any, eventName: string){
477+
chartObj.addEventListener(eventName, (eventObj:any, dataObj:any) => {
478+
let fEventObj:FusionChartsEvent = { eventObj:{}, dataObj:{} };
479+
if(eventObj) fEventObj.eventObj = eventObj;
480+
if(dataObj) fEventObj.dataObj = dataObj;
481+
this[eventName].emit(fEventObj);
482+
});
483+
}
484+
485+
attachAllChartEvents(chartObj:any, eventList:Array<string>){
486+
eventList.forEach(eventName => {
487+
this.attachChartEventListener(chartObj, eventName);
488+
});
489+
}
490+
*/
491491
FusionChartsComponent.prototype.generateEventsCallback = function (eventList$$1) {
492492
var _this_1 = this;
493493
var events = {};
@@ -542,8 +542,8 @@ var FusionChartsComponent = /** @class */ (function () {
542542
FusionChartsComponent.decorators = [
543543
{ type: _angular_core.Component, args: [{
544544
selector: 'fusioncharts',
545-
template: "<div attr.id=\"container-{{containerId}}\" style='width:100%;height:100%'>{{placeholder}}</div>\n ",
546-
providers: [FusionChartsService],
545+
template: "\n <div attr.id=\"container-{{containerId}}\" style=\"width:100%;height:100%\">\n {{ placeholder }}\n </div>\n ",
546+
providers: [FusionChartsService]
547547
},] },
548548
];
549549
/** @nocollapse */

dist/dist/index.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/src/fusioncharts.component.js

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/src/fusioncharts.component.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/src/fusioncharts.component.metadata.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/src/fusioncharts.service.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/src/fusioncharts.service.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 11 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
"bootstrap": "^3.3.7",
6363
"core-js": "^2.4.1",
6464
"prismjs": "^1.6.0",
65-
"fusioncharts": "^3.13.1-sr.1",
6665
"rxjs": "^5.4.1",
6766
"zone.js": "^0.8.14"
6867
},
@@ -76,6 +75,7 @@
7675
"@types/node": "~6.0.60",
7776
"codelyzer": "~3.0.1",
7877
"codemirror": "^5.39.2",
78+
"fusioncharts": "^3.13.2-sr.1",
7979
"jasmine-core": "~2.6.2",
8080
"jasmine-spec-reporter": "~4.1.0",
8181
"karma": "^3.0.0",

0 commit comments

Comments
 (0)