|
45 | 45 | map: '@', |
46 | 46 | markers: '@', |
47 | 47 | initialized: '&', |
48 | | - datasourceDt: '=datasourceDt', |
49 | | - datasource: '=datasource' |
| 48 | + datasourceDt: '=datasourceDt' |
50 | 49 | }, |
51 | 50 | fcEvents = [ |
52 | 51 | 'beforelinkeditemopen', |
|
220 | 219 | }); |
221 | 220 | } |
222 | 221 |
|
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 | | - |
234 | 222 | var observeConf = { |
235 | 223 | // non-data componenet observers |
236 | 224 | NDCObserver: { |
|
718 | 706 | } |
719 | 707 | } |
720 | 708 |
|
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; |
758 | 715 | } |
759 | 716 |
|
760 | 717 | for (observableAttr in observeConf.DCObserver) { |
|
786 | 743 |
|
787 | 744 | createFCChart(); |
788 | 745 |
|
| 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 | + |
789 | 784 | scope.$on('$destroy', function() { |
790 | 785 | // on destroy free used resources to avoid memory leaks |
791 | 786 | if (chart && chart.dispose) { |
|
0 commit comments