add test and remove helper

Author: agrass

dc.js

@@ -1545,6 +1545,19 @@ dc.baseMixin = function (_chart) {
         return _chart;
     };
 
+
+    /**
+    #### .legendLabelAccessor([legendLabelAccessorFunction])
+    Set or get the legend label accessor function. The legend label accessor function is used to retrieve the
+    value from the legend label for the crossfilter group.
+    ```js
+    // default legenLabel accessor
+    chart.legendLabelAccessor(function(d) { return d.key; });
+    // custom legen label accessor for a multi-value crossfilter reduction
+    chart.legendLabelAccessor(function(p) { return "Custom Legend:" + p.key; });
+    ```
+
+    **/
     _chart.legendLabelAccessor = function (_) {
         if (!arguments.length) {
             return _legendLabelAccessor;
@@ -1576,10 +1589,6 @@ dc.baseMixin = function (_chart) {
         return _chart;
     };
 
-    _chart.getLegendLabel = function (d, i) {
-        return _legendLabelAccessor.call(this, d, i);
-    };
-
     /**
     #### .renderLabel(boolean)
     Turn on/off label rendering
@@ -4137,7 +4146,7 @@ dc.pieChart = function (parent, chartGroup) {
 
     _chart.legendables = function () {
         return _chart.data().map(function (d, i) {
-            var legendable = {name: _chart.getLegendLabel(d, i), data: d.value, others: d.others, chart:_chart};
+            var legendable = {name: _chart.legendLabelAccessor(d, i), data: d.value, others: d.others, chart:_chart};
             legendable.color = _chart.getColor(d, i);
             return legendable;
         });

dc.min.js

@@ -25,8 +25,40 @@
     "url": "https://github.com/dc-js/dc.js.git"
   },
   "dependencies": {
+    "browser-resolve": "^1.8.2",
+    "browserify-zlib": "^0.1.4",
+    "concat-stream": "^1.4.8",
     "crossfilter": "1.x",
-    "d3": "3.x"
+    "crypto-browserify": "^3.9.14",
+    "d3": "3.x",
+    "defined": "^1.0.0",
+    "domain-browser": "^1.1.4",
+    "duplexer2": "0.0.2",
+    "events": "^1.0.2",
+    "has": "^1.0.0",
+    "http-browserify": "^1.7.0",
+    "https-browserify": "0.0.0",
+    "isarray": "0.0.1",
+    "labeled-stream-splicer": "^1.0.2",
+    "marked": "^0.3.3",
+    "os-browserify": "^0.1.2",
+    "path-browserify": "0.0.0",
+    "phantomjs": "^1.9.16",
+    "process": "^0.10.1",
+    "punycode": "^1.3.2",
+    "querystring-es3": "^0.2.1",
+    "read-only-stream": "^1.1.1",
+    "readable-stream": "^1.0.33",
+    "shallow-copy": "0.0.1",
+    "stream-browserify": "^1.0.0",
+    "string_decoder": "^0.10.31",
+    "through2": "^0.6.5",
+    "timers-browserify": "^1.4.0",
+    "tty-browserify": "0.0.0",
+    "url": "^0.10.3",
+    "util": "^0.10.3",
+    "vm-browserify": "0.0.4",
+    "xtend": "^4.0.0"
   },
   "devDependencies": {
     "emu": "~0.0.2",

dc.min.js.map

@@ -658,6 +658,32 @@ describe('dc.pieChart', function() {
             valueDimension.filterAll();
         });
     });
+
+
+    describe('legends with label', function() {
+        var chart;
+        beforeEach(function() {
+            chart = buildChart("pie-chart-legend")
+                .cap(3)
+                .legend(dc.legend())
+                .legendLabelAccessor(function(d){
+                   return d.key + " labeled";
+                })
+                .render();
+        });
+        it('should generate items for each slice', function() {
+            expect(chart.selectAll('g.dc-legend g.dc-legend-item').size()).toEqual(chart.data().length);
+        });
+        it('should include "others" item labeled', function() {
+            var numOthersGroups = chart.selectAll('g.dc-legend g.dc-legend-item text').filter(function(d, i) {
+                return d.name == "Others labeled";
+            }).size();
+            expect(numOthersGroups).toEqual(1);
+        });
+        afterEach(function() {
+            valueDimension.filterAll();
+        });
+    });
 });
 
 

package.json

@@ -895,6 +895,19 @@ dc.baseMixin = function (_chart) {
         return _chart;
     };
 
+
+    /**
+    #### .legendLabelAccessor([legendLabelAccessorFunction])
+    Set or get the legend label accessor function. The legend label accessor function is used to retrieve the
+    value from the legend label for the crossfilter group.
+    ```js
+    // default legenLabel accessor
+    chart.legendLabelAccessor(function(d) { return d.key; });
+    // custom legen label accessor for a multi-value crossfilter reduction
+    chart.legendLabelAccessor(function(p) { return "Custom Legend:" + p.key; });
+    ```
+
+    **/
     _chart.legendLabelAccessor = function (_) {
         if (!arguments.length) {
             return _legendLabelAccessor;
@@ -926,10 +939,6 @@ dc.baseMixin = function (_chart) {
         return _chart;
     };
 
-    _chart.getLegendLabel = function (d, i) {
-        return _legendLabelAccessor.call(this, d, i);
-    };
-
     /**
     #### .renderLabel(boolean)
     Turn on/off label rendering

spec/bar-chart-spec.js

@@ -429,7 +429,7 @@ dc.pieChart = function (parent, chartGroup) {
 
     _chart.legendables = function () {
         return _chart.data().map(function (d, i) {
-            var legendable = {name: _chart.getLegendLabel(d, i), data: d.value, others: d.others, chart:_chart};
+            var legendable = {name: _chart.legendLabelAccessor(d, i), data: d.value, others: d.others, chart:_chart};
             legendable.color = _chart.getColor(d, i);
             return legendable;
         });