Browse Source

Fix conflict

pull/263/merge
Masayuki Tanaka 11 years ago
parent
commit
0c4a3ba6ab
  1. 18
      c3.js
  2. 6
      c3.min.js

18
c3.js

@ -48,6 +48,7 @@
arcs: 'c3-arcs',
area: 'c3-area',
areas: 'c3-areas',
empty: 'c3-empty',
text: 'c3-text',
texts: 'c3-texts',
gaugeValue: 'c3-gauge-value',
@ -167,6 +168,9 @@
__data_ondragstart = getConfig(['data', 'ondragstart'], function () {}),
__data_ondragend = getConfig(['data', 'ondragend'], function () {});
// configuration for no plot-able data supplied.
var __data_empty_label_text = getConfig(['data', 'empty', 'label', 'text'], "");
// subchart
var __subchart_show = getConfig(['subchart', 'show'], false),
__subchart_size_height = getConfig(['subchart', 'size', 'height'], 60);
@ -2842,6 +2846,12 @@
/*-- Main Region --*/
// text when empty
main.append("text")
.attr("class", CLASS.text + ' ' + CLASS.empty)
.attr("text-anchor", "middle") // horizontal centering of text at x position in all browsers.
.attr("dominant-baseline", "middle"); // vertical centering of text at y position in all browsers, except IE.
// Grids
grid = main.append('g')
.attr("clip-path", clipPath)
@ -3503,6 +3513,14 @@
// xgrid focus
updateXgridFocus();
// Data empty label positioning and text.
main.select("text." + CLASS.text + '.' + CLASS.empty)
.attr("x", width / 2)
.attr("y", height / 2)
.text(__data_empty_label_text)
.transition()
.style('opacity', targetsToShow.length ? 0 : 1);
// grid
main.select('line.' + CLASS.xgridFocus).style("visibility", "hidden");
if (__grid_x_show) {

6
c3.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save