From e141efe18e3b9f9893ecfb09efb308d62f0315bb Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips <jephilli@redhat.com>
Date: Thu, 21 Jul 2016 17:06:38 -0400
Subject: [PATCH] Fix donut pct, line, and sparkline charts to update when
 config or data changes

---
 src/charts/donut/donut-pct-chart-directive.js     | 2 +-
 src/charts/line/line-chart.directive.js           | 2 +-
 src/charts/sparkline/sparkline-chart.directive.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/charts/donut/donut-pct-chart-directive.js b/src/charts/donut/donut-pct-chart-directive.js
index 31790c678..503d5f30f 100644
--- a/src/charts/donut/donut-pct-chart-directive.js
+++ b/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;
diff --git a/src/charts/line/line-chart.directive.js b/src/charts/line/line-chart.directive.js
index 6fe7a90e4..93201b277 100644
--- a/src/charts/line/line-chart.directive.js
+++ b/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;
diff --git a/src/charts/sparkline/sparkline-chart.directive.js b/src/charts/sparkline/sparkline-chart.directive.js
index 836966dc4..a37107406 100644
--- a/src/charts/sparkline/sparkline-chart.directive.js
+++ b/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) {