Fix issue speced#89

shikhar-scs · Jul 17, 2014 · cdc3b21 · cdc3b21
1 parent 078206f
commit cdc3b21
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/js/metrics-graphics.js b/js/metrics-graphics.js
@@ -747,6 +747,7 @@ charts.line = function(args) {
                             if(args.linked) {
                                 var v = d[args.x_accessor];
                                 var formatter = d3.time.format('%Y-%m-%d');
+
                                 return 'line' + d['line_id'] + '-color ' + 'roll_' + formatter(v);
                             }
                             else {
@@ -766,12 +767,17 @@ charts.line = function(args) {
             g.selectAll('.rollover-rects')
                 .data(args.data[0]).enter()
                     .append('rect')
-                        .attr('class', function(d) {
+                        .attr('class', function(d, i) {
                             if(args.linked) {
                                 var v = d[args.x_accessor];
                                 var formatter = d3.time.format('%Y-%m-%d');
-
-                                return 'line' + line_id + '-color ' + 'roll_' + formatter(v);
+
+                                //only format when y-axis is date
+                                var id = (typeof v === 'number')
+                                        ? i
+                                        : formatter(v);
+
+                                return 'line' + line_id + '-color ' + 'roll_' + id;
                             }
                             else {
                                 return 'line' + line_id + '-color';
@@ -850,8 +856,13 @@ charts.line = function(args) {
                 var v = d[args.x_accessor];
                 var formatter = d3.time.format('%Y-%m-%d');
 
+                //only format when y-axis is date
+                var id = (typeof v === 'number')
+                        ? i
+                        : formatter(v);
+
                 //trigger mouseover on matching line in .linked charts
-                d3.selectAll('.line' + d['line_id'] + '-color.roll_' + formatter(v))
+                d3.selectAll('.line' + d['line_id'] + '-color.roll_' + id)
                     .each(function(d, i) {
                         d3.select(this).on('mouseover')(d,i);
                 })
@@ -916,7 +927,12 @@ charts.line = function(args) {
                 var v = d[args.x_accessor];
                 var formatter = d3.time.format('%Y-%m-%d');
 
-                d3.selectAll('.roll_' + formatter(v))
+                //only format when y-axis is date
+                var id = (typeof v === 'number')
+                        ? i
+                        : formatter(v);
+
+                d3.selectAll('.roll_' + id)
                     .each(function(d, i){
                         d3.select(this).on('mouseout')(d);
                 });