Skip to content

Commit 5744451

Browse files
rohanoid5ashok1994
authored andcommitted
Added patch fix for IE 11 (#72)
1 parent aff3f25 commit 5744451

File tree

5 files changed

+117
-110
lines changed

5 files changed

+117
-110
lines changed

dist/angular-fusioncharts.js

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@
4545
map: '@',
4646
markers: '@',
4747
initialized: '&',
48-
datasourceDt: '=datasourceDt',
49-
datasource: '=datasource'
48+
datasourceDt: '=datasourceDt'
5049
},
5150
fcEvents = [
5251
'beforelinkeditemopen',
@@ -220,17 +219,6 @@
220219
});
221220
}
222221

223-
if (scope.datasourceDt) {
224-
scope.$watch(
225-
'datasourceDt.data',
226-
function(newData, oldData) {
227-
if (newData !== oldData) updateData(newData, 'data');
228-
},
229-
false
230-
);
231-
createWatchersForAttrs(scope.datasourceDt);
232-
}
233-
234222
var observeConf = {
235223
// non-data componenet observers
236224
NDCObserver: {
@@ -718,43 +706,12 @@
718706
}
719707
}
720708

721-
if (chartConfigObject.dataFormat === 'json') {
722-
if (scope.datasource) {
723-
attrs.datasource = scope.datasource;
724-
chartConfigObject.dataSource = scope.datasource;
725-
dataStringStore.dataSource = scope.datasource;
726-
727-
scope.$watch(
728-
'datasource',
729-
function(newData, oldData) {
730-
if (newData !== oldData) {
731-
chartConfigObject.dataSource = scope.datasource;
732-
dataStringStore.dataSource = scope.datasource;
733-
setChartData();
734-
if (chartConfigObject.dataFormat === 'json') {
735-
setChartData();
736-
} else {
737-
if (chartConfigObject.dataFormat === 'xml') {
738-
chart.setXMLData(newData);
739-
} else if (chartConfigObject.dataFormat === 'jsonurl') {
740-
chart.setJSONUrl(newData);
741-
} else if (chartConfigObject.dataFormat === 'xmlurl') {
742-
chart.setXMLUrl(newData);
743-
}
744-
}
745-
}
746-
},
747-
true
748-
);
749-
}
750-
} else {
751-
if (attrs.datasource) {
752-
chartConfigObject.dataSource =
753-
chartConfigObject.dataFormat === 'json'
754-
? JSON.parse(attrs.datasource)
755-
: attrs.datasource;
756-
dataStringStore.dataSource = attrs.datasource;
757-
}
709+
if (attrs.datasource) {
710+
chartConfigObject.dataSource =
711+
chartConfigObject.dataFormat === 'json'
712+
? JSON.parse(attrs.datasource)
713+
: attrs.datasource;
714+
dataStringStore.dataSource = attrs.datasource;
758715
}
759716

760717
for (observableAttr in observeConf.DCObserver) {
@@ -786,6 +743,44 @@
786743

787744
createFCChart();
788745

746+
if (attrs.type.toLowerCase() === 'timeseries' && scope.datasourceDt) {
747+
scope.$watch(
748+
'datasourceDt.data',
749+
function(newData, oldData) {
750+
if (newData !== oldData) updateData(newData, 'data');
751+
},
752+
false
753+
);
754+
createWatchersForAttrs(scope.datasourceDt);
755+
} else if (scope.datasourceDt) {
756+
attrs.datasourceDt = scope.datasourceDt;
757+
chartConfigObject.dataSource = scope.datasourceDt;
758+
dataStringStore.dataSource = scope.datasourceDt;
759+
setChartData();
760+
scope.$watch(
761+
'datasourceDt',
762+
function(newData, oldData) {
763+
if (newData !== oldData) {
764+
chartConfigObject.dataSource = scope.datasourceDt;
765+
dataStringStore.dataSource = scope.datasourceDt;
766+
setChartData();
767+
if (chartConfigObject.dataFormat === 'json') {
768+
setChartData();
769+
} else {
770+
if (chartConfigObject.dataFormat === 'xml') {
771+
chart.setXMLData(newData);
772+
} else if (chartConfigObject.dataFormat === 'jsonurl') {
773+
chart.setJSONUrl(newData);
774+
} else if (chartConfigObject.dataFormat === 'xmlurl') {
775+
chart.setXMLUrl(newData);
776+
}
777+
}
778+
}
779+
},
780+
true
781+
);
782+
}
783+
789784
scope.$on('$destroy', function() {
790785
// on destroy free used resources to avoid memory leaks
791786
if (chart && chart.dispose) {

0 commit comments

Comments
 (0)