Skip to content

Core fix/datasource bidirectional binding #68

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
merged 6 commits into from
Jan 8, 2019
Merged

Core fix/datasource bidirectional binding #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b81996
Modified data binding method for datasource
rohanoid5 Jan 8, 2019
13586c7
Added check for different dataformats
rohanoid5 Jan 8, 2019
6d347d3
Minor fix
rohanoid5 Jan 8, 2019
33440e1
Fixed conflict
rohanoid5 Jan 8, 2019
b0a9c25
Changed Data string source
rohanoid5 Jan 8, 2019
26cbccc
Minor fix
rohanoid5 Jan 8, 2019
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
9 changes: 6 additions & 3 deletions dist/angular-fusioncharts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,10 @@
scope: scope,
link: function(scope, element, attrs) {
function updateData(key, data) {
scope.datasourceDt.key = data;
chart.setJSONData(scope.datasourceDt);
if (key) {
Copy link
Contributor

@ashok1994 ashok1994 Jan 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is key here ???? @rohanoid5

scope.datasourceDt.key = data;
chart.setJSONData(scope.datasourceDt);
}
}

function createWatchersForAttrs(datasource) {
Expand Down Expand Up @@ -689,6 +691,7 @@
}
}
}

for (i = 0; i < attribs.length; i++) {
attr = attribs[i];
if (attr.match(/^on/i)) {
Expand Down Expand Up @@ -719,7 +722,7 @@
if (scope.datasource) {
attrs.datasource = scope.datasource;
chartConfigObject.dataSource = scope.datasource;
dataStringStore.dataSource = attrs.datasource;
dataStringStore.dataSource = scope.datasource;

scope.$watch(
'datasource',
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-fusioncharts.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions src/angular-fusioncharts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,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) {
Expand Down Expand Up @@ -689,6 +691,7 @@
}
}
}

for (i = 0; i < attribs.length; i++) {
attr = attribs[i];
if (attr.match(/^on/i)) {
Expand Down Expand Up @@ -719,7 +722,7 @@
if (scope.datasource) {
attrs.datasource = scope.datasource;
chartConfigObject.dataSource = scope.datasource;
dataStringStore.dataSource = attrs.datasource;
dataStringStore.dataSource = scope.datasource;

scope.$watch(
'datasource',
Expand Down