Browse Source

Merge pull request #537 from jkuchta/master

Changed .class properties to ['class'] to prevent IE8 JS errors, IE8 tre...
pull/590/head
Masayuki Tanaka 10 years ago
parent
commit
18fcc2d6c4
  1. 12
      c3.js

12
c3.js

@ -3213,7 +3213,7 @@
.data(config.grid_x_lines); .data(config.grid_x_lines);
// enter // enter
xgridLine = $$.xgridLines.enter().append('g') xgridLine = $$.xgridLines.enter().append('g')
.attr("class", function (d) { return CLASS.xgridLine + (d.class ? ' ' + d.class : ''); }); .attr("class", function (d) { return CLASS.xgridLine + (d["class"] ? ' ' + d["class"] : ''); });
xgridLine.append('line') xgridLine.append('line')
.style("opacity", 0); .style("opacity", 0);
xgridLine.append('text') xgridLine.append('text')
@ -3238,7 +3238,7 @@
.data(config.grid_y_lines); .data(config.grid_y_lines);
// enter // enter
ygridLine = $$.ygridLines.enter().append('g') ygridLine = $$.ygridLines.enter().append('g')
.attr("class", function (d) { return CLASS.ygridLine + (d.class ? ' ' + d.class : ''); }); .attr("class", function (d) { return CLASS.ygridLine + (d["class"] ? ' ' + d["class"] : ''); });
ygridLine.append('line') ygridLine.append('line')
.style("opacity", 0); .style("opacity", 0);
ygridLine.append('text') ygridLine.append('text')
@ -3331,7 +3331,7 @@
return params ? function (line) { return params ? function (line) {
var found = false; var found = false;
[].concat(params).forEach(function (param) { [].concat(params).forEach(function (param) {
if ((('value' in param && line.value === params.value) || ('class' in param && line.class === params.class))) { if ((('value' in param && line.value === params.value) || ('class' in param && line["class"]=== params["class"]))) {
found = true; found = true;
} }
}); });
@ -5233,7 +5233,7 @@
return this.classShapes(d) + this.generateClass(CLASS.areas, d.id); return this.classShapes(d) + this.generateClass(CLASS.areas, d.id);
}; };
c3_chart_internal_fn.classRegion = function (d, i) { c3_chart_internal_fn.classRegion = function (d, i) {
return this.generateClass(CLASS.region, i) + ' ' + ('class' in d ? d.class : ''); return this.generateClass(CLASS.region, i) + ' ' + ('class' in d ? d["class"] : '');
}; };
c3_chart_internal_fn.classEvent = function (d) { c3_chart_internal_fn.classEvent = function (d) {
return this.generateClass(CLASS.eventRect, d.index); return this.generateClass(CLASS.eventRect, d.index);
@ -5917,10 +5917,10 @@
config.regions = config.regions.filter(function (region) { config.regions = config.regions.filter(function (region) {
var found = false; var found = false;
if (!region.class) { if (!region["class"]) {
return true; return true;
} }
region.class.split(' ').forEach(function (c) { region["class"].split(' ').forEach(function (c) {
if (classes.indexOf(c) >= 0) { found = true; } if (classes.indexOf(c) >= 0) { found = true; }
}); });
return !found; return !found;

Loading…
Cancel
Save