Merge branch 'release/5.0.1'

ashok1994 · ashok1994 · commit bf1ed4100a56 · 2019-01-24T17:05:49.000+05:30
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A simple and lightweight official AngularJS component for FusionCharts JavaScript charting library. angularjs-fusioncharts enables you to add JavaScript charts in your AngularJS application without any hassle.
 
-## [Demo](https://fusioncharts.github.io/angular-fusioncharts/)
+## [Demo](https://fusioncharts.github.io/angularjs-fusioncharts/)
 
 - Github Repo: [https://github.com/fusioncharts/angularjs-fusioncharts](https://github.com/fusioncharts/angularjs-fusioncharts)
 - Documentation: [https://www.fusioncharts.com/dev/getting-started/angular/angularjs/your-first-chart-using-angularjs](https://www.fusioncharts.com/dev/getting-started/angular/angularjs/your-first-chart-using-angularjs)
@@ -24,6 +24,7 @@ A simple and lightweight official AngularJS component for FusionCharts JavaScrip
 - [Quick Start](#quick-start)
 - [Going Beyond Charts](#going-beyond-charts)
 - [Usage and Integration of FusionTime](#usage-and-integration-of-fusiontime)
+- [Special note for IE Users](#special-note)
 - [For Contributors](#for-contributors)
 - [Licensing](#licensing)
 
@@ -40,7 +41,7 @@ A simple and lightweight official AngularJS component for FusionCharts JavaScrip
 To install `angularjs-fusioncharts` library, run:
 
 ```bash
-$ npm install angular-fusioncharts --save
+$ npm install angularjs-fusioncharts --save
 ```
 
 To install `fusioncharts` library:
@@ -339,25 +340,33 @@ var app = angular.module('myApp', ['ng-fusioncharts']);
 
 var jsonify = res => res.json();
 var dataFetch = fetch(
-  'https://raw.githubusercontent.com/fusioncharts/dev_centre_docs/fusiontime-beta-release/charts-resources/fusiontime/online-sales-single-series/data.json'
+  'https://s3.eu-central-1.amazonaws.com/fusion.store/ft/data/line-chart-with-time-axis-data.json'
 ).then(jsonify);
 var schemaFetch = fetch(
-  'https://raw.githubusercontent.com/fusioncharts/dev_centre_docs/fusiontime-beta-release/charts-resources/fusiontime/online-sales-single-series/schema.json'
+  'https://s3.eu-central-1.amazonaws.com/fusion.store/ft/schema/line-chart-with-time-axis-schema.json'
 ).then(jsonify);
 
 var app = angular.module('myApp', ['ng-fusioncharts']);
 
 app.controller('MyController', function($scope) {
   $scope.dataSource = {
-    caption: { text: 'Online Sales of a SuperStore in the US' },
     data: null,
+    caption: {
+      text: 'Sales Analysis'
+    },
+    subcaption: {
+      text: 'Grocery'
+    },
     yAxis: [
       {
-        plot: [
-          {
-            value: 'Sales ($)'
-          }
-        ]
+        plot: {
+          value: 'Grocery Sales Value',
+          type: 'line'
+        },
+        format: {
+          prefix: '$'
+        },
+        title: 'Sale Value'
       }
     ]
   };
@@ -414,6 +423,30 @@ Useful links for FusionTime
 - [How FusionTime works](https://www.fusioncharts.com/dev/fusiontime/getting-started/how-fusion-time-works)
 - [Create your first chart](https://www.fusioncharts.com/dev/fusiontime/getting-started/create-your-first-chart-in-fusiontime)
 
+## Special Note
+
+If you want to support your application on IE(11 and below), then you need to take following steps:
+
+### Firstly
+
+You have to update your `angularjs-fusioncharts` and `fusioncharts` modules to latest versions. For `angularjs-fusioncharts` install `v5.0.1` and above; for `fusioncharts` install `v3.13.3-sr.1` and above.
+
+### Secondly
+
+In your template, modify your code like so,
+
+```html
+<div
+  fusioncharts
+  width="600"
+  height="400"
+  type="ANY_CHART_TYPE"
+  datasource-dt="dataSource"
+>
+  // Instead of passing data in datasouce, use datasource-dt.
+</div>
+```
+
 ## For Contributors
 
 - Clone the repository and install dependencies
diff --git a/dist/angular-fusioncharts.js b/dist/angular-fusioncharts.js
@@ -199,8 +199,10 @@
         scope: scope,
         link: function(scope, element, attrs) {
           function updateData(key, data) {
-            scope.datasourceDt.key = data;
-            chart.setJSONData(scope.datasourceDt);
+            if (key) {
+              scope.datasourceDt.key = data;
+              chart.setJSONData(scope.datasourceDt);
+            }
           }
 
           function createWatchersForAttrs(datasource) {
@@ -217,17 +219,6 @@
             });
           }
 
-          if (scope.datasourceDt) {
-            scope.$watch(
-              'datasourceDt.data',
-              function(newData, oldData) {
-                if (newData !== oldData) updateData(newData, 'data');
-              },
-              false
-            );
-            createWatchersForAttrs(scope.datasourceDt);
-          }
-
           var observeConf = {
               // non-data componenet observers
               NDCObserver: {
@@ -627,7 +618,6 @@
                   chart.setJSONData(chartConfigObject.dataSource);
                 }
               }, 0);
-
               // chart.setJSONData(chartConfigObject.dataSource);
             },
             createFCChart = function() {
@@ -689,6 +679,7 @@
               }
             }
           }
+
           for (i = 0; i < attribs.length; i++) {
             attr = attribs[i];
             if (attr.match(/^on/i)) {
@@ -752,6 +743,44 @@
 
           createFCChart();
 
+          if (attrs.type.toLowerCase() === 'timeseries' && scope.datasourceDt) {
+            scope.$watch(
+              'datasourceDt.data',
+              function(newData, oldData) {
+                if (newData !== oldData) updateData(newData, 'data');
+              },
+              false
+            );
+            createWatchersForAttrs(scope.datasourceDt);
+          } else if (scope.datasourceDt) {
+            attrs.datasourceDt = scope.datasourceDt;
+            chartConfigObject.dataSource = scope.datasourceDt;
+            dataStringStore.dataSource = scope.datasourceDt;
+            setChartData();
+            scope.$watch(
+              'datasourceDt',
+              function(newData, oldData) {
+                if (newData !== oldData) {
+                  chartConfigObject.dataSource = scope.datasourceDt;
+                  dataStringStore.dataSource = scope.datasourceDt;
+                  setChartData();
+                  if (chartConfigObject.dataFormat === 'json') {
+                    setChartData();
+                  } else {
+                    if (chartConfigObject.dataFormat === 'xml') {
+                      chart.setXMLData(newData);
+                    } else if (chartConfigObject.dataFormat === 'jsonurl') {
+                      chart.setJSONUrl(newData);
+                    } else if (chartConfigObject.dataFormat === 'xmlurl') {
+                      chart.setXMLUrl(newData);
+                    }
+                  }
+                }
+              },
+              true
+            );
+          }
+
           scope.$on('$destroy', function() {
             // on destroy free used resources to avoid memory leaks
             if (chart && chart.dispose) {
diff --git a/dist/angular-fusioncharts.min.js b/dist/angular-fusioncharts.min.js
diff --git a/example/data.json b/example/data.json
@@ -0,0 +1,44 @@
+{
+  "chart": {
+    "caption": "Countries With Most Oil Reserves [2017-18]",
+    "subCaption": "In MMbbl = One Million barrels",
+    "xAxisName": "Country",
+    "yAxisName": "Reserves (MMbbl)",
+    "numberSuffix": "K",
+    "theme": "fusion"
+  },
+  "data": [
+    {
+      "label": "Venezuela",
+      "value": "290"
+    },
+    {
+      "label": "Saudi",
+      "value": "260"
+    },
+    {
+      "label": "Canada",
+      "value": "180"
+    },
+    {
+      "label": "Iran",
+      "value": "140"
+    },
+    {
+      "label": "Russia",
+      "value": "115"
+    },
+    {
+      "label": "UAE",
+      "value": "100"
+    },
+    {
+      "label": "US",
+      "value": "30"
+    },
+    {
+      "label": "China",
+      "value": "30"
+    }
+  ]
+}
diff --git a/example/index.html b/example/index.html
@@ -30,9 +30,25 @@
         height="400"
         type="timeseries"
       ></div>
+      <div
+        fusioncharts
+        datasource-dt="columnDS"
+        width="600"
+        height="400"
+        type="column2d"
+      ></div>
       <div
         fusioncharts
         datasource="{{ columnDS }}"
+        dataFormat="json"
+        width="600"
+        height="400"
+        type="column2d"
+      ></div>
+      <div
+        fusioncharts
+        datasource="data.json"
+        dataFormat="jsonurl"
         width="600"
         height="400"
         type="column2d"
diff --git a/example/index.js b/example/index.js
@@ -1,24 +1,32 @@
 var jsonify = res => res.json();
 var dataFetch = fetch(
-  'https://raw.githubusercontent.com/fusioncharts/dev_centre_docs/fusiontime-beta-release/charts-resources/fusiontime/online-sales-single-series/data.json'
+  'https://s3.eu-central-1.amazonaws.com/fusion.store/ft/data/line-chart-with-time-axis-data.json'
 ).then(jsonify);
 var schemaFetch = fetch(
-  'https://raw.githubusercontent.com/fusioncharts/dev_centre_docs/fusiontime-beta-release/charts-resources/fusiontime/online-sales-single-series/schema.json'
+  'https://s3.eu-central-1.amazonaws.com/fusion.store/ft/schema/line-chart-with-time-axis-schema.json'
 ).then(jsonify);
 
 var app = angular.module('myApp', ['ng-fusioncharts']);
 
 app.controller('MyController', function($scope) {
   $scope.timeSeriesDS = {
-    caption: { text: 'Online Sales of a SuperStore in the US' },
     data: null,
+    caption: {
+      text: 'Sales Analysis'
+    },
+    subcaption: {
+      text: 'Grocery'
+    },
     yAxis: [
       {
-        plot: [
-          {
-            value: 'Sales ($)'
-          }
-        ]
+        plot: {
+          value: 'Grocery Sales Value',
+          type: 'line'
+        },
+        format: {
+          prefix: '$'
+        },
+        title: 'Sale Value'
       }
     ]
   };
@@ -47,6 +55,7 @@ app.controller('MyController', function($scope) {
   $scope.update = function() {
     $scope.timeSeriesDS.caption.text = 'Something Else';
     $scope.columnDS.chart.caption = 'Something Else';
+    $scope.columnDS.data[1].value = '340';
   };
 
   Promise.all([dataFetch, schemaFetch]).then(res => {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angularjs-fusioncharts",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Angular plugin for FusionCharts",
   "main": "dist/angular-fusioncharts.js",
   "repository": {
diff --git a/src/angular-fusioncharts.js b/src/angular-fusioncharts.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angularjs-fusioncharts",`
`3`		`- "version": "5.0.0",`
	`3`	`+ "version": "5.0.1",`
`4`	`4`	`"description": "Angular plugin for FusionCharts",`
`5`	`5`	`"main": "dist/angular-fusioncharts.js",`
`6`	`6`	`"repository": {`