diff --git a/app/assets/javascripts/graphs/bar_group.js b/app/assets/javascripts/graphs/bar_group.js index 46262957e..2a40dbbf0 100644 --- a/app/assets/javascripts/graphs/bar_group.js +++ b/app/assets/javascripts/graphs/bar_group.js @@ -3,12 +3,12 @@ var growstuff = (window.growstuff = window.growstuff || {}); -function BarGroup(bars) { - this._bars = bars; +function BarGroup(data) { + this._data = data } BarGroup.prototype.render = function(d3){ - var bars = this._bars; + var bars = this._data.bars; return d3.append('g') .attr("class", "bar") .selectAll("rect") diff --git a/app/assets/javascripts/graphs/horizontal_bar_graph.js b/app/assets/javascripts/graphs/horizontal_bar_graph.js index 9357b0357..32f99ea2f 100644 --- a/app/assets/javascripts/graphs/horizontal_bar_graph.js +++ b/app/assets/javascripts/graphs/horizontal_bar_graph.js @@ -18,7 +18,7 @@ var width = this._data.width; var height = this._data.height; var margin = this._data.margin; - var barGroup = new BarGroup(bars); + var barGroup = new BarGroup(this._data); var barLabelGroup = new BarLabelGroup(this._data); var margin = this._data.margin; var svg = d3 diff --git a/spec/javascripts/graphs/bar_group_spec.js b/spec/javascripts/graphs/bar_group_spec.js index 24d19d7e9..6e0cf6058 100644 --- a/spec/javascripts/graphs/bar_group_spec.js +++ b/spec/javascripts/graphs/bar_group_spec.js @@ -11,7 +11,10 @@ {name: 'Shade', value: 0.2}, {name: 'Half Shade', value: 0.5} ]; - subject = new BarGroup(bars); + var data = { + bars:bars + }; + subject = new BarGroup(data); subject.render(d3.select('#jasmine_content').append('svg')); })