Skip to content

Commit aa7140a

Browse files
committed
Merge branch 'feature/jserror_json_parse_when_undefined_config_object' into develop
2 parents a2df1a0 + d63bbc1 commit aa7140a

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

dist/angular-fusioncharts.min.js

Lines changed: 2 additions & 2 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
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-fusioncharts",
3-
"version": "2.0.0",
3+
"version": "2.1.0",
44
"description": "Angular plugin for FusionCharts",
55
"main": "src/angular-fusioncharts",
66
"repository": {

src/angular-fusioncharts.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,15 @@
303303
'config': {
304304
ifExist: false,
305305
observer: function (newVal) {
306-
var configObj = JSON.parse(newVal),
307-
attr;
308-
for (attr in configObj) {
309-
chartConfigObject[attr] = configObj[attr];
306+
var configObj;
307+
if (newVal) {
308+
configObj = JSON.parse(newVal),
309+
attr;
310+
for (attr in configObj) {
311+
chartConfigObject[attr] = configObj[attr];
312+
}
313+
createFCChart();
310314
}
311-
createFCChart();
312315
}
313316
}
314317
},

0 commit comments

Comments
 (0)