Merge pull request #25 from aomra015/legendParent

wrap canvas with a div if legend is true
adopted-ember-addons · Jun 7, 2015 · cf65b4d · cf65b4d
2 parents 02904a1 + ea4402e
commit cf65b4d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/addon/components/ember-chart.js b/addon/components/ember-chart.js
@@ -16,6 +16,7 @@ export default Ember.Component.extend({
 
     if (this.get('legend')) {
       var legend = chart.generateLegend();
+      this.$().wrap("<div class='chart-parent'></div>");
       this.$().parent().append(legend);
     }
 

diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
@@ -15,7 +15,7 @@
 
 <div>
 	<h3>Pie Chart</h3>
-	{{ember-chart type='Pie' data=pieData width=200 height=200}}
+	{{ember-chart type='Pie' data=pieData width=200 height=200 legend=true}}
 </div>
 
 <div>
@@ -47,4 +47,4 @@
 	{{ember-chart type='polar area' data=polarAreaData width=400 height=400}}
 </div>
 
-{{outlet}}
+{{outlet}}
diff --git a/tests/unit/components/ember-chart-test.js b/tests/unit/components/ember-chart-test.js
@@ -107,6 +107,19 @@ test('it can be a pie chart', function(assert) {
   assert.equal(chart.segments.length, 3);
 });
 
+test('it can be a pie chart with legend', function(assert) {
+  var component = this.subject({
+    type: 'Pie',
+    data: testData.get('pieData'),
+    legend: true
+  });
+
+  var chartParent = this.$().parent();
+
+  assert.ok(chartParent.hasClass('chart-parent'));
+  assert.ok(chartParent.find('.pie-legend').length);
+});
+
 test('it can be a line chart', function(assert) {
   var component = this.subject({
     type: 'Line',