From 1c9a95b395917440ac7e27b27db710109450c47b Mon Sep 17 00:00:00 2001
From: Masayuki Tanaka <masayuki0812@mac.com>
Date: Thu, 15 Aug 2013 14:09:48 +0900
Subject: [PATCH] Fix data name on tooltip and legend

---
 c3.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/c3.js b/c3.js
index 7f019e4..41a6ebf 100644
--- a/c3.js
+++ b/c3.js
@@ -102,9 +102,9 @@
         // tooltip - show when mouseover on each data
         var __tooltip_contents = getConfig(['tooltip','contents'], function(d) {
             var date = isTimeSeries ? d[0].x.getFullYear() + '.' + (d[0].x.getMonth()+1) + '.' + d[0].x.getDate() : isCategorized ? category(d[0].x) : d[0].x,
-                text = "<table class='tooltip'><tr><th colspan='2'>" + date + "</th></tr>"
-            for (var i = 0; i < d.length; i++){
-                var value = (typeof d[i].value !== 'undefined') ? (Math.round(d[i].value*100)/100).toFixed(2) : '-'
+                text = "<table class='tooltip'><tr><th colspan='2'>" + date + "</th></tr>", i
+            for (i = 0; i < d.length; i++){
+                var value = typeof d[i].value !== 'undefined' ? (Math.round(d[i].value*100)/100).toFixed(2) : '-';
                 text += "<tr><td>" + d[i].name + "</td><td class='value'>" + value + "</td></tr>"
             }
             return text + "</table>"
@@ -826,11 +826,12 @@
                     if (dragging) return // do nothing if dragging
 
                     var selectedData = c3.data.targets.map(function(d){ return d.values[i] });
-                    var j, newData
+                    var j, newData, name;
 
                     // Add id,name to selectedData
                     for (j = 0; j < selectedData.length; j++) {
-                        selectedData[j].name = __data_names[selectedData[j].id]
+                        name = __data_names[selectedData[j].id];
+                        selectedData[j].name = typeof name !== 'undefined' ? name : selectedData[j].id;
                     }
                     // Sort selectedData as names order
                     if (Object.keys(__data_names).length > 0) {
@@ -1417,7 +1418,7 @@
                 .attr('width', 10)
                 .attr('height', 10)
             l.append('text')
-                .text(function(d){ return __data_names[d] })
+                .text(function(d){ return typeof __data_names[d] !== 'undefined' ? __data_names[d] : d; })
                 .attr('x', -200)
                 .attr('y', function(d,i){ return legendHeight/2 })