From 25e8ad2f236f12b94cc22c57102c0681d1363a35 Mon Sep 17 00:00:00 2001 From: Jan Teichmann Date: Thu, 20 Aug 2015 13:33:08 +0100 Subject: [PATCH] remove tabs --- spec/tooltip-spec.js | 30 +++++++++++++++--------------- src/tooltip.js | 28 ++++++++++++++-------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/spec/tooltip-spec.js b/spec/tooltip-spec.js index 6038cbe..15f2772 100644 --- a/spec/tooltip-spec.js +++ b/spec/tooltip-spec.js @@ -100,23 +100,23 @@ describe('c3 chart tooltip', function () { }); describe('tooltip getTooltipContent', function () { - beforeAll(function () { + beforeAll(function () { tooltipConfiguration = { - data_order: 'desc' - }; + data_order: 'desc' + }; }); - it('should sort values desc', function () { - var eventRect = d3.select('.c3-event-rect-2').node(); - window.setMouseEvent(chart, 'mousemove', 100, 100, eventRect); - - var tooltipTable = d3.select('.c3-tooltip')[0]; - var expected = ["", "c3-tooltip-name--data3", - "c3-tooltip-name--data1", "c3-tooltip-name--data2"]; - var i; - for (i = 0; i < tooltipTable[0].rows.length; i++) { - expect(tooltipTable[0].rows[i].className).toBe(expected[i]); - } - }); + it('should sort values desc', function () { + var eventRect = d3.select('.c3-event-rect-2').node(); + window.setMouseEvent(chart, 'mousemove', 100, 100, eventRect); + + var tooltipTable = d3.select('.c3-tooltip')[0]; + var expected = ["", "c3-tooltip-name--data3", + "c3-tooltip-name--data1", "c3-tooltip-name--data2"]; + var i; + for (i = 0; i < tooltipTable[0].rows.length; i++) { + expect(tooltipTable[0].rows[i].className).toBe(expected[i]); + } }); + }); }); diff --git a/src/tooltip.js b/src/tooltip.js index f42383e..61bf7b3 100644 --- a/src/tooltip.js +++ b/src/tooltip.js @@ -30,23 +30,23 @@ c3_chart_internal_fn.getTooltipContent = function (d, defaultTitleFormat, defaul nameFormat = config.tooltip_format_name || function (name) { return name; }, valueFormat = config.tooltip_format_value || defaultValueFormat, text, i, title, value, name, bgcolor, - orderAsc = $$.isOrderAsc(); + orderAsc = $$.isOrderAsc(); if (config.data_groups.length === 0) { - d.sort(function(a,b){ - return orderAsc ? a.value - b.value : b.value - a.value; - }); + d.sort(function(a,b){ + return orderAsc ? a.value - b.value : b.value - a.value; + }); } else { - var ids = $$.orderTargets($$.data.targets).map(function (i) { - return i.id; - }); - d.sort(function(a, b) { - if (a.value > 0 && b.value > 0) { - return orderAsc ? ids.indexOf(a.id) - ids.indexOf(b.id) : ids.indexOf(b.id) - ids.indexOf(a.id); - } else { - return orderAsc ? a.value - b.value : b.value - a.value; - } - }); + var ids = $$.orderTargets($$.data.targets).map(function (i) { + return i.id; + }); + d.sort(function(a, b) { + if (a.value > 0 && b.value > 0) { + return orderAsc ? ids.indexOf(a.id) - ids.indexOf(b.id) : ids.indexOf(b.id) - ids.indexOf(a.id); + } else { + return orderAsc ? a.value - b.value : b.value - a.value; + } + }); } for (i = 0; i < d.length; i++) {