From 1d3c9ec8cee048422e6121cceaffcd6c2759e7ec Mon Sep 17 00:00:00 2001 From: Reinoud van Santen Date: Fri, 14 Nov 2014 11:44:56 +0100 Subject: [PATCH 1/3] Made the printing of the data value in the popover optional by a configuration key in popoverOpts --- src/classes/BubbleChart/Popover.coffee | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/classes/BubbleChart/Popover.coffee b/src/classes/BubbleChart/Popover.coffee index 282129b..9ee694a 100644 --- a/src/classes/BubbleChart/Popover.coffee +++ b/src/classes/BubbleChart/Popover.coffee @@ -8,6 +8,9 @@ class BubbleChart.Popover @opacity = o.opacity or 0.8 @labelSize = o.labelSize or 18 @metricSize = o.metricSize or 12 + @popoverShowData = true + if o.popoverShowData? + @popoverShowData = o.popoverShowData @last_draw = null @textDems = {} @pre = null @@ -62,7 +65,11 @@ class BubbleChart.Popover tb_pad = 5 * ratio triangle_width = 16 * ratio triangle_height = 8 * ratio - metric_text = "#{@bubble.data} #{@bubble.metric}" + + if this.popoverShowData + metric_text = "#{@bubble.data} #{@bubble.metric}" + else + metric_text = "#{@bubble.metric}" l_dems = @getTextDems context, @bubble.label, labelSize, @textFont m_dems = @getTextDems context, metric_text, metricSize, @textFont From ca92b0dd6d99a1b295aac14d4550bf235a477bd1 Mon Sep 17 00:00:00 2001 From: Reinoud van Santen Date: Fri, 14 Nov 2014 11:53:07 +0100 Subject: [PATCH 2/3] Updated documentation --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6047ed4..6dbcc00 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ This is the exploded view of possbile options (with included defaults) labelSize: 22, // Popover Heading size metricSize: 14, // Popover Metric size opacity: 0.6, + popoverShowData: true // Show the data value of the bubble in the popover } } ``` From a1a39988ef0ede4eb5c6b177395a62510bd81c77 Mon Sep 17 00:00:00 2001 From: Reinoud van Santen Date: Fri, 14 Nov 2014 11:56:48 +0100 Subject: [PATCH 3/3] Added test --- test/classes/BubbleChart/PopoverTest.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/classes/BubbleChart/PopoverTest.js b/test/classes/BubbleChart/PopoverTest.js index 7cecf36..a1ab40c 100644 --- a/test/classes/BubbleChart/PopoverTest.js +++ b/test/classes/BubbleChart/PopoverTest.js @@ -29,6 +29,7 @@ labelSize: 3, metricSize: 5, opacity: 5, + popoverShowData: true }); equal(popover.fillColor, '#000'); @@ -37,6 +38,7 @@ equal(popover.labelSize, 3); equal(popover.metricSize, 5); equal(popover.opacity, 5); + equal(popover.popoverShowData, true); }); test('constructor-defaults', function() {