Skip to content

Commit

Permalink
Merge branch 'FLOE-404' into FLOE-412
Browse files Browse the repository at this point in the history
  • Loading branch information
waharnum committed Sep 25, 2015
2 parents 225aaad + b74a919 commit 69d2cac
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/js/legend.js
Expand Up @@ -223,12 +223,11 @@ https://github.com/gpii/universal/LICENSE.txt
// added values

gpii.chartAuthoring.pieChart.legend.addValueFromArray = function (objectArray, valueArray, newValueName) {
// Don't do anything if not passed an actual array in the value array
if(fluid.isArrayable(valueArray)) {
return fluid.transform(objectArray, function (object, idx) {
var consolidated = fluid.copy(object);
// Don't do anything if not passed an actual array in the value array

consolidated[newValueName] = valueArray[idx];
consolidated[newValueName] = valueArray[idx];

return consolidated;
});
Expand Down

0 comments on commit 69d2cac

Please sign in to comment.