Merge pull request patternfly#267 from jeff-phillips-18/fixes

Fix donut pct, line, and sparkline charts to update when config or da…

Author: dtaylor113

src/charts/donut/donut-pct-chart-directive.js

@@ -378,7 +378,7 @@ angular.module('patternfly.charts').directive('pfDonutPctChart', function (pfUti
 
         $scope.updateAll = function (scope) {
           $scope.updateAvailable();
-          $scope.config.data = pfUtils.merge($scope.getDonutData($scope), $scope.config.data);
+          $scope.config.data = pfUtils.merge($scope.config.data, $scope.getDonutData($scope));
           $scope.config.color = $scope.statusDonutColor($scope);
           $scope.config.tooltip = donutTooltip(scope);
           $scope.config.data.onclick = $scope.config.onClickFn;

src/charts/line/line-chart.directive.js

@@ -213,7 +213,7 @@ angular.module('patternfly.charts').directive('pfLineChart', function (pfUtils)
     link: function (scope) {
       scope.$watch('config', function () {
         scope.config.data = pfUtils.merge(scope.config.data, scope.getLineData(scope.chartData));
-        scope.chartConfig = pfUtils.merge(scope.config, scope.defaultConfig);
+        scope.chartConfig = pfUtils.merge(scope.defaultConfig, scope.config);
       }, true);
       scope.$watch('showXAxis', function () {
         scope.chartConfig.axis.x.show = scope.showXAxis === true;

src/charts/sparkline/sparkline-chart.directive.js

@@ -310,14 +310,14 @@ angular.module('patternfly.charts').directive('pfSparklineChart', function (pfUt
         $scope.config.data = pfUtils.merge($scope.config.data, $scope.getSparklineData($scope.chartData));
 
         // Override defaults with callers specifications
-        $scope.chartConfig = pfUtils.merge($scope.config, $scope.defaultConfig);
+        $scope.chartConfig = pfUtils.merge($scope.defaultConfig, $scope.config);
       }
     ],
 
     link: function (scope) {
       scope.$watch('config', function () {
         scope.config.data = pfUtils.merge(scope.config.data, scope.getSparklineData(scope.chartData));
-        scope.chartConfig = pfUtils.merge(scope.config, scope.defaultConfig);
+        scope.chartConfig = pfUtils.merge(scope.defaultConfig, scope.config);
       }, true);
       scope.$watch('chartHeight', function () {
         if (scope.chartHeight) {