Merge branch 'release/1.0.2'

Author: rousan

README.md

@@ -19,18 +19,13 @@ import { AppComponent } from './app.component';
 // Import angular2-fusioncharts
 import { FusionChartsModule } from 'angular2-fusioncharts';
 
-// Import FusionCharts library
+// Import FusionCharts library and chart modules
 import * as FusionCharts from 'fusioncharts';
-// Load FusionCharts Charts module
-let Charts = require('fusioncharts/fusioncharts.charts');
+import * as Charts from 'fusioncharts/fusioncharts.charts';
+import * as FintTheme from 'fusioncharts/themes/fusioncharts.theme.fint';
 
-// Create FusionCharts provider function
-export function FusionChartsProvider () {
-  // Resolve charts dependency
-  Charts(FusionCharts);
-
-  return FusionCharts;
-}
+// Pass the fusioncharts library and chart modules
+FusionChartsModule.fcRoot(FusionCharts, Charts, FintTheme);
 
 @NgModule({
   declarations: [
@@ -40,8 +35,7 @@ export function FusionChartsProvider () {
   imports: [
     BrowserModule,
     // Specify FusionChartsModule as import
-    // and pass FusionChartsProvider as a dependency
-    FusionChartsModule.forRoot(FusionChartsProvider)
+    FusionChartsModule
   ],
   providers: [],
   bootstrap: [AppComponent]

dist/dist/index.js

@@ -16,25 +16,47 @@ FusionChartsStatic.decorators = [
 FusionChartsStatic.ctorParameters = function () { return []; };
 var FusionChartsService = (function () {
     function FusionChartsService(FCStatic) {
-        /* TODO: Need to remove this when FusionCharts becomes ES6 modules */
-        if (FCStatic.core && FCStatic.core.getCurrentRenderer &&
-            FCStatic.core.getCurrentRenderer() === 'javascript') {
-            this._fusionchartsStatice = FCStatic.core;
+        var fcRoot;
+        if (FusionChartsService.isFCRootSet()) {
+            fcRoot = FusionChartsService.getFCRoot();
         }
         else {
-            this._fusionchartsStatice = FCStatic.core();
+            fcRoot = {
+                core: FCStatic.core,
+                modules: FCStatic.modules
+            };
         }
-        if (FCStatic && FCStatic.modules) {
-            FCStatic.modules.forEach(function (FusionChartsModules) {
-                FusionChartsModules(FCStatic.core);
+        this.resolveFusionCharts(fcRoot.core, fcRoot.modules);
+    }
+    FusionChartsService.setFCRoot = function (fcRoot) {
+        FusionChartsService._fcRoot = fcRoot;
+    };
+    FusionChartsService.getFCRoot = function () {
+        return FusionChartsService._fcRoot;
+    };
+    FusionChartsService.isFCRootSet = function () {
+        return !!FusionChartsService._fcRoot;
+    };
+    FusionChartsService.prototype.resolveFusionCharts = function (core, modules) {
+        if (core && core.getCurrentRenderer &&
+            core.getCurrentRenderer() === 'javascript') {
+            this._fusionchartsStatice = core;
+        }
+        else {
+            this._fusionchartsStatice = core();
+        }
+        if (modules) {
+            modules.forEach(function (FusionChartsModules) {
+                FusionChartsModules(core);
             });
         }
-    }
+    };
     FusionChartsService.prototype.getFusionChartsStatic = function () {
         return this._fusionchartsStatice;
     };
     return FusionChartsService;
 }());
+FusionChartsService._fcRoot = null;
 FusionChartsService.decorators = [
     { type: _angular_core.Injectable },
 ];
@@ -306,6 +328,7 @@ FusionChartsPipe.ctorParameters = function () { return []; };
 var FusionChartsModule = (function () {
     function FusionChartsModule() {
     }
+    // Keep this for backward compatible
     FusionChartsModule.forRoot = function (fcCore) {
         var fcModules = [];
         for (var _i = 1; _i < arguments.length; _i++) {
@@ -322,6 +345,16 @@ var FusionChartsModule = (function () {
                 }]
         };
     };
+    FusionChartsModule.fcRoot = function (fcCore) {
+        var fcModules = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            fcModules[_i - 1] = arguments[_i];
+        }
+        FusionChartsService.setFCRoot({
+            core: fcCore,
+            modules: fcModules
+        });
+    };
     return FusionChartsModule;
 }());
 FusionChartsModule.decorators = [
@@ -335,6 +368,10 @@ FusionChartsModule.decorators = [
                     FusionChartsComponent,
                     FusionChartsDirective,
                     FusionChartsPipe
+                ],
+                providers: [
+                    FusionChartsService,
+                    FusionChartsStatic
                 ]
             },] },
 ];

dist/dist/index.min.js

@@ -6,4 +6,5 @@ import { FusionChartsStatic } from './src/fusioncharts.service';
 export { FusionChartsComponent, FusionChartsDirective, FusionChartsPipe, FusionChartsStatic };
 export declare class FusionChartsModule {
     static forRoot(fcCore?: any, ...fcModules: any[]): ModuleWithProviders;
+    static fcRoot(fcCore?: any, ...fcModules: any[]): void;
 }