From 4c2099e8e9470777d87b9b485c7b046625e4bccb Mon Sep 17 00:00:00 2001 From: Masayuki Tanaka Date: Thu, 22 Aug 2013 15:58:33 +0900 Subject: [PATCH] Fix tooltip class --- c3.css | 12 +++--- c3.js | 2 +- c3.min.js | 114 +++++++++++++++++++++++++++--------------------------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/c3.css b/c3.css index c8383ca..df6f8d7 100644 --- a/c3.css +++ b/c3.css @@ -90,7 +90,7 @@ text { /*-- Tooltip --*/ -.tooltip { +.-tooltip { border-collapse:collapse; border-spacing:0; background-color:#fff; @@ -100,28 +100,28 @@ text { box-shadow: 7px 7px 12px -9px rgba(119,119,119,10); opacity: 0.9; } -.tooltip tr { +.-tooltip tr { border:1px solid #CCC; } -.tooltip th { +.-tooltip th { background-color: #aaa; font-size:14px; padding:2px 5px; text-align:left; color:#FFF; } -.tooltip td { +.-tooltip td { font-size:13px; padding: 3px 6px; background-color:#fff; border-left:1px dotted #999; } -.tooltip td > span { +.-tooltip td > span { display: inline-block; width: 10px; height: 10px; margin-right: 6px; } -.tooltip td.value{ +.-tooltip td.value{ text-align: right; } diff --git a/c3.js b/c3.js index 16bbd0d..de4f896 100644 --- a/c3.js +++ b/c3.js @@ -104,7 +104,7 @@ // 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 = "", i, value, name; + text = "
" + date + "
", i, value, name; for (i = 0; i < d.length; i++){ if (isDefined(d[i])) { value = isDefined(d[i].value) ? (Math.round(d[i].value*100)/100).toFixed(2) : '-'; diff --git a/c3.min.js b/c3.min.js index 81ae211..59feaaa 100644 --- a/c3.min.js +++ b/c3.min.js @@ -1,57 +1,57 @@ -(function(Ha){function Za(){function w(c,k){c.attr("transform",function(c){return"translate("+(k(c)+R)+",0)"})}function c(c,k){c.attr("transform",function(c){return"translate(0,"+k(c)+")"})}function m(c){var k=c[0];c=c[c.length-1];return ks[d].indexOf(p.id)))for(e=0;e=q;q+=diffx2)la+="M"+b(g(q))+" "+d(h(q))+" "+b(g(q+k))+" "+d(h(q+k));return la}function Qa(a){var b=h.data.targets= -z(a),d,e;r.domain(d3.extent(a.map(function(a){return a.x})));A.domain(l(b,"y"));fa.domain(l(b,"y2"));D.domain(r.domain());La.domain(A.domain());Ka.domain(fa.domain());x.ticks(10>a.length?a.length:10);d=g.append("g").attr("clip-path",Ca).attr("class","grid");kb&&d.append("g").attr("class","xgrids");Ra&&(e=d.append("g").attr("class","xgrid-lines").selectAll(".xgrid-line").data(Ra).enter().append("g").attr("class","xgrid-line"),e.append("line").attr("class",function(a){return""+a["class"]}),e.append("text").attr("class", -function(a){return""+a["class"]}).attr("text-anchor","end").attr("transform",f?"":"rotate(-90)").attr("dx",f?0:-t.top).attr("dy",-6).text(function(a){return a.text}));Rb&&d.append("g").attr("class","xgrid-focus").append("line").attr("class","xgrid-focus").attr("x1",f?0:-10).attr("x2",f?u:-10).attr("y1",f?-10:t.top).attr("y2",f?-10:v);lb&&d.append("g").attr("class","ygrids");Sa&&d.append("g").attr("class","ygrid-lines").selectAll("ygrid-line").data(Sa).enter().append("line").attr("class",function(a){return"ygrid-line "+ -a["class"]});g.append("g").attr("clip-path",Ca).attr("class","regions");g.append("g").attr("clip-path",Ca).attr("class","chart");g.select(".chart").append("g").attr("class","event-rects").style("fill-opacity",0).selectAll(".event-rects").data(a).enter().append("rect").attr("class",function(a,b){return"event-rect event-rect-"+b}).style("cursor",function(a){return V&&aa?"pointer":null}).on("mouseover",function(a,b){if(!Da){var d=h.data.targets.map(function(a){return a.values[b]}),e,c;for(e=0;e",d,c,f;for(d=0;d";return b+"
" + date + "
"+f+""+c+"
"}),wb=w.bindto.replace("#","")+"-clip",Ca="url(#"+wb+")",ga="timeseries"===ub,wa="categorized"===ub,Ua=null,Da=!1,ca=ra? -40:0,cc=function(a){return function(b){for(var d=a.length-1,c=a[d];!c[1](b);)c=a[--d];return c[0](b)}}([[d3.time.format("%Y/%-m/%-d"),function(){return!0}],[d3.time.format("%-m/%-d"),function(a){return a.getMonth()}],[d3.time.format("%-m/%-d"),function(a){return 1!=a.getDate()}],[d3.time.format("%-m/%-d"),function(a){return a.getDay()&&1!=a.getDate()}],[d3.time.format("%I %p"),function(a){return a.getHours()}],[d3.time.format("%I:%M"),function(a){return a.getMinutes()}],[d3.time.format(":%S"),function(a){return a.getSeconds()}], -[d3.time.format(".%L"),function(a){return a.getMilliseconds()}]]),t={top:0,right:ob&&!f?50:1,bottom:20+tb+ca,left:40},xb=Fa-tb-ca,dc=Fa-ca,u=Zb-t.left-t.right,v=Fa-t.top-t.bottom,qa=Fa-xb-(20+ca),Jb=d3.time.format($b).parse,ec=f?10:0,fc=f?v:u,yb=f?0:v,zb=f?u:1,r=(ga?d3.time.scale():d3.scale.linear()).range([ec,fc]),A=d3.scale.linear().range([yb,zb]),fa=d3.scale.linear().range([yb,zb]),D=(ga?d3.time.scale():d3.scale.linear()).range([0,u]),La=d3.scale.linear().range([qa,10]),Ka=d3.scale.linear().range([qa, -10]),x=wa?Za():d3.svg.axis(),oa=d3.svg.axis(),Wa=d3.svg.axis(),ha=wa?Za():d3.svg.axis();x.scale(r).orient(f?"left":"bottom");oa.scale(A).orient(f?"bottom":"left");Wa.scale(fa).orient(f?"top":"right");ha.scale(D).orient("bottom");ga&&x.tickFormat(cc);wa?(x.categories(Ga).tickCentered(vb),ha.categories(Ga).tickCentered(vb)):(x.tickOffset=function(){return 0},ha.tickOffset=function(){return 0});wa&&function(){var a=r,b=D,d=Object.keys(r),c,f;r=function(b){return a(b)+x.tickOffset()};D=function(a){return b(a)+ -ha.tickOffset()};for(f=0;fa?0:a},Q=function(a,b){var d=[],c=null!==b?b:"#1f77b4 #ff7f0e #2ca02c #d62728 #9467bd #8c564b #e377c2 #7f7f7f #bcbd22 #17becf".split(" "); -return function(b){if(b in a)return a[b];0<=d.indexOf(b)||d.push(b);return c[d.indexOf(b)%c.length]}}(ac,bc),da=d3.select(w.bindto).append("svg").attr("width",u+t.left+t.right).attr("height",v+t.top+t.bottom);da.append("defs");da.select("defs").append("clipPath").attr("id",wb).append("rect").attr("y",t.top).attr("width",u).attr("height",v-t.top);da.select("defs").append("clipPath").attr("id","xaxis-clip").append("rect").attr("x",-1).attr("y",-1).attr("width",u+2).attr("height",40);da.select("defs").append("clipPath").attr("id", -"yaxis-clip").append("rect").attr("x",-39).attr("y",t.top-1).attr("width",40).attr("height",v-t.top+2);var g=da.append("g").attr("transform","translate("+t.left+","+t.top+")"),M=null;pa&&(M=da.append("g").attr("transform","translate(40,"+xb+")"));var ua=null;ra&&(ua=da.append("g").attr("transform","translate(40,"+dc+")"));var Ea=d3.select(w.bindto).style("position","relative").append("div").style("position","absolute").style("width","30%").style("z-index","10").style("visibility","hidden"),ea=d3.svg.brush().x(D).on("brush", -function(){N({withTransition:!1,withY:!1,withSubchart:!1})}),Ba=null,Ma=null;h.focus=function(a){h.defocus();d3.selectAll(va(a)).filter(function(a){return Ja(a.id)}).classed("focused",!0).transition().duration(100).style("opacity",1)};h.defocus=function(a){d3.selectAll(va(a)).filter(function(a){return Ja(a.id)}).classed("focused",!1).transition().duration(100).style("opacity",0.3)};h.revert=function(a){d3.selectAll(va(a)).filter(function(a){return Ja(a.id)}).classed("focused",!1).transition().duration(100).style("opacity", -1)};h.show=function(a){d3.selectAll(va(a)).transition().style("opacity",1)};h.hide=function(a){d3.selectAll(va(a)).transition().style("opacity",0)};h.load=function(a){n(a.done)&&(a.done=function(){});if("cacheIds"in a&&ja(a.cacheIds))sa(J(a.cacheIds),a.done);else if("data"in a)sa(z(data),a.done);else if("url"in a)d3.csv(a.url,function(b,d){sa(z(d),a.done)});else if("rows"in a)sa(z(P(a.rows)),a.done);else if("columns"in a)sa(z(R(a.columns)),a.done);else throw Error("url or rows or columns is required."); -};h.unload=function(a){h.data.targets=h.data.targets.filter(function(b){return b.id!=a});d3.selectAll(".target-"+a).transition().style("opacity",0).remove();ra&&(d3.selectAll(".legend-item-"+a).remove(),Ya(h.data.targets));0b.classes.indexOf(a)})});return E};h.data.get=function(a){a=h.data.getAsTarget(a);return m(a)?a.values.map(function(a){return a.value}):void 0};h.data.getAsTarget=function(a){var b=B(function(b){return b.id==a});return 0a.length?a.length:10);d=g.append("g").attr("clip-path",Fa).attr("class","grid");ob&&d.append("g").attr("class","xgrids");Va&&(f=d.append("g").attr("class","xgrid-lines").selectAll(".xgrid-line").data(Va).enter().append("g").attr("class", +"xgrid-line"),f.append("line").attr("class",function(a){return""+a["class"]}),f.append("text").attr("class",function(a){return""+a["class"]}).attr("text-anchor","end").attr("transform",e?"":"rotate(-90)").attr("dx",e?0:-m.top).attr("dy",-6).text(function(a){return a.text}));Xb&&d.append("g").attr("class","xgrid-focus").append("line").attr("class","xgrid-focus").attr("x1",e?0:-10).attr("x2",e?r:-10).attr("y1",e?-10:m.top).attr("y2",e?-10:t);pb&&d.append("g").attr("class","ygrids");Wa&&d.append("g").attr("class", +"ygrid-lines").selectAll("ygrid-line").data(Wa).enter().append("line").attr("class",function(a){return"ygrid-line "+a["class"]});g.append("g").attr("clip-path",Fa).attr("class","regions");g.append("g").attr("clip-path",Fa).attr("class","chart");g.select(".chart").append("g").attr("class","event-rects").style("fill-opacity",0).selectAll(".event-rects").data(a).enter().append("rect").attr("class",function(a,b){return"event-rect event-rect-"+b}).style("cursor",function(){return U&&aa?"pointer":null}).on("mouseover", +function(a,b){if(!Ga){var d=h.data.targets.map(function(a){return a.values[b]}),f,c;for(f=0;fq[f].indexOf(a.id)))for(c=0;c",d,c,e;for(d=0;d"+e+""+c+"";return b+""}),Eb=u.bindto.replace("#","")+"-clip",Fa="url(#"+Eb+")",ga="timeseries"===Cb,ya="categorized"===Cb,Ya=null,Ga=!1,ca=ta?40:0,Fb,cb=[[d3.time.format("%Y/%-m/%-d"),function(){return!0}],[d3.time.format("%-m/%-d"),function(a){return a.getMonth()}], +[d3.time.format("%-m/%-d"),function(a){return 1!=a.getDate()}],[d3.time.format("%-m/%-d"),function(a){return a.getDay()&&1!=a.getDate()}],[d3.time.format("%I %p"),function(a){return a.getHours()}],[d3.time.format("%I:%M"),function(a){return a.getMinutes()}],[d3.time.format(":%S"),function(a){return a.getSeconds()}],[d3.time.format(".%L"),function(a){return a.getMilliseconds()}]];Fb=function(a){for(var b=cb.length-1,d=cb[b];!d[1](a);)d=cb[--b];return d[0](a)};var m={top:0,right:sb&&!e?50:1,bottom:20+ +Ab+ca,left:40},Gb=Ia-Ab-ca,ec=Ia-ca,r=cc-m.left-m.right,t=Ia-m.top-m.bottom,sa=Ia-Gb-(20+ca),Sb=d3.time.format(dc).parse,fc=e?10:0,gc=e?t:r,Hb=e?0:t,Ib=e?r:1,n=(ga?d3.time.scale():d3.scale.linear()).range([fc,gc]),D=d3.scale.linear().range([Hb,Ib]),fa=d3.scale.linear().range([Hb,Ib]),F=(ga?d3.time.scale():d3.scale.linear()).range([0,r]),Qa=d3.scale.linear().range([sa,10]),Pa=d3.scale.linear().range([sa,10]),B=ya?fb():d3.svg.axis(),qa=d3.svg.axis(),$a=d3.svg.axis(),ia=ya?fb():d3.svg.axis();B.scale(n).orient(e? +"left":"bottom");qa.scale(D).orient(e?"bottom":"left");$a.scale(fa).orient(e?"top":"right");ia.scale(F).orient("bottom");ga&&B.tickFormat(Fb);ya?(B.categories(Ja).tickCentered(Db),ia.categories(Ja).tickCentered(Db)):(B.tickOffset=function(){return 0},ia.tickOffset=function(){return 0});if(ya){var Ka=n,Jb=F,Kb=Object.keys(n),za,La,n=function(a){return Ka(a)+B.tickOffset()},F=function(a){return Jb(a)+ia.tickOffset()};for(La=0;La=h;h+=diffx2)k+="M"+ +d(i(h))+" "+c(l(h))+" "+d(i(h+m))+" "+c(l(h+m))}}b=k}else b=db(a.values);return b}b=n(a.values[0].x);a=X(a.id)(a.values[0].value);return e?"M "+a+" "+b:"M "+b+" "+a};var vb,hc=d3.svg.line().x(function(a){return F(a.x)}).y(function(a){return z(a.id)(a.value)});vb=function(a){return Sa(a)?hc(a.values):"M "+F(a.values[0].x)+" "+z(a.id)(a.values[0].value)};var wb=function(a){return"start"in a?n(a.start):0},xb=function(a){var b="start"in a?n(a.start):0,a=("end"in a?n(a.end):r)-b;return 0>a?0:a},N,eb=[], +Lb=null!==Bb?Bb:"#1f77b4 #ff7f0e #2ca02c #d62728 #9467bd #8c564b #e377c2 #7f7f7f #bcbd22 #17becf".split(" ");N=function(a){if(a in zb)return zb[a];0<=eb.indexOf(a)||eb.push(a);return Lb[eb.indexOf(a)%Lb.length]};var da=d3.select(u.bindto).append("svg").attr("width",r+m.left+m.right).attr("height",t+m.top+m.bottom);da.append("defs");da.select("defs").append("clipPath").attr("id",Eb).append("rect").attr("y",m.top).attr("width",r).attr("height",t-m.top);da.select("defs").append("clipPath").attr("id", +"xaxis-clip").append("rect").attr("x",-1).attr("y",-1).attr("width",r+2).attr("height",40);da.select("defs").append("clipPath").attr("id","yaxis-clip").append("rect").attr("x",-39).attr("y",m.top-1).attr("width",40).attr("height",t-m.top+2);var g=da.append("g").attr("transform","translate("+m.left+","+m.top+")"),O=null;ra&&(O=da.append("g").attr("transform","translate(40,"+Gb+")"));var wa=null;ta&&(wa=da.append("g").attr("transform","translate(40,"+ec+")"));var Ha=d3.select(u.bindto).style("position", +"relative").append("div").style("position","absolute").style("width","30%").style("z-index","10").style("visibility","hidden"),ha=d3.svg.brush().x(F).on("brush",function(){P({withTransition:!1,withY:!1,withSubchart:!1})}),Da=null,Ra=null;h.focus=function(a){h.defocus();d3.selectAll(xa(a)).filter(function(a){return x(a.id)}).classed("focused",!0).transition().duration(100).style("opacity",1)};h.defocus=function(a){d3.selectAll(xa(a)).filter(function(a){return x(a.id)}).classed("focused",!1).transition().duration(100).style("opacity", +0.3)};h.revert=function(a){d3.selectAll(xa(a)).filter(function(a){return x(a.id)}).classed("focused",!1).transition().duration(100).style("opacity",1)};h.show=function(a){d3.selectAll(xa(a)).transition().style("opacity",1)};h.hide=function(a){d3.selectAll(xa(a)).transition().style("opacity",0)};h.load=function(a){p(a.done)&&(a.done=function(){});var b;if(b="cacheIds"in a)a:{b=a.cacheIds;for(var d=0;db.classes.indexOf(a)})});return G};h.data.get=function(a){a=h.data.getAsTarget(a);return j(a)?a.values.map(function(a){return a.value}):void 0};h.data.getAsTarget=function(a){var b=Aa(function(b){return b.id== +a});return 0