Skip to content

Added patch fix for IE 11 #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashok1994 merged 1 commit into from
Jan 24, 2019
Merged

Added patch fix for IE 11 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 45 additions & 50 deletions dist/angular-fusioncharts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
map: '@',
markers: '@',
initialized: '&',
datasourceDt: '=datasourceDt',
datasource: '=datasource'
datasourceDt: '=datasourceDt'
},
fcEvents = [
'beforelinkeditemopen',
Expand Down Expand Up @@ -220,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: {
Expand Down Expand Up @@ -718,43 +706,12 @@
}
}

if (chartConfigObject.dataFormat === 'json') {
if (scope.datasource) {
attrs.datasource = scope.datasource;
chartConfigObject.dataSource = scope.datasource;
dataStringStore.dataSource = scope.datasource;

scope.$watch(
'datasource',
function(newData, oldData) {
if (newData !== oldData) {
chartConfigObject.dataSource = scope.datasource;
dataStringStore.dataSource = scope.datasource;
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
);
}
} else {
if (attrs.datasource) {
chartConfigObject.dataSource =
chartConfigObject.dataFormat === 'json'
? JSON.parse(attrs.datasource)
: attrs.datasource;
dataStringStore.dataSource = attrs.datasource;
}
if (attrs.datasource) {
chartConfigObject.dataSource =
chartConfigObject.dataFormat === 'json'
? JSON.parse(attrs.datasource)
: attrs.datasource;
dataStringStore.dataSource = attrs.datasource;
}

for (observableAttr in observeConf.DCObserver) {
Expand Down Expand Up @@ -786,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) {
Expand Down
Loading