playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge branch 'master' of https://github.com/masayuki0812/c3 into axisTickGenerator 

Conflicts:
	c3.min.js
pull/747/head
michalkop93 10 years ago
parent
b1e0981580 bfffa3c4b3
commit
715c39f191
6 changed files with 22 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      c3.js
  2. 9
      c3.min.js
  3. 1
      src/axis.js
  4. 4
      src/drag.js
  5. 8
      src/interaction.js
  6. 5
      src/subchart.js

18
c3.js
Unescape View File

@ -2271,7 +2271,7 @@
// Call event handler
$$.main.selectAll('.' + CLASS.shape + '-' + index).each(function (d) {
config.data_onmouseover.call($$, d);
config.data_onmouseover.call($$.api, d);
});
})
.on('mouseout', function (d) {
@ -2284,7 +2284,7 @@
$$.unexpandBars();
// Call event handler
$$.main.selectAll('.' + CLASS.shape + '-' + index).each(function (d) {
config.data_onmouseout.call($$, d);
config.data_onmouseout.call($$.api, d);
});
})
.on('mousemove', function (d) {
@ -2399,7 +2399,7 @@
closest = $$.findClosestFromTargets(targetsToShow, mouse);
if ($$.mouseover && (!closest || closest.id !== $$.mouseover.id)) {
config.data_onmouseout.call($$, $$.mouseover);
config.data_onmouseout.call($$.api, $$.mouseover);
$$.mouseover = undefined;
}
@ -2433,7 +2433,7 @@
if ($$.isBarType(closest.id) || $$.dist(closest, mouse) < 100) {
$$.svg.select('.' + CLASS.eventRect).style('cursor', 'pointer');
if (!$$.mouseover) {
config.data_onmouseover.call($$, closest);
config.data_onmouseover.call($$.api, closest);
$$.mouseover = closest;
}
}
@ -4353,6 +4353,7 @@
// rotate tick text if needed
if (!config.axis_rotated && config.axis_x_tick_rotate) {
$$.rotateTickText($$.axes.x, transitions.axisX, config.axis_x_tick_rotate);
$$.rotateTickText($$.axes.subx, transitions.axisSubX, config.axis_x_tick_rotate);
}
};
@ -4949,7 +4950,7 @@
.attr('class', CLASS.dragarea)
.style('opacity', 0.1);
$$.dragging = true;
$$.config.data_ondragstart();
$$.config.data_ondragstart.call($$.api);
};
c3_chart_internal_fn.dragend = function () {
@ -4963,7 +4964,7 @@
$$.main.selectAll('.' + CLASS.shape)
.classed(CLASS.INCLUDED, false);
$$.dragging = false;
$$.config.data_ondragend();
$$.config.data_ondragend.call($$.api);
};
@ -5144,11 +5145,6 @@
// update subchart elements if needed
if (withSubchart) {
// rotate tick text if needed
if (!config.axis_rotated && config.axis_x_tick_rotate) {
$$.rotateTickText($$.axes.subx, transitions.axisSubX, config.axis_x_tick_rotate);
}
// extent rect
if (!$$.brush.empty()) {
$$.brush.extent($$.x.orgDomain()).update();

9
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/axis.js
Unescape View File

@ -368,5 +368,6 @@ c3_chart_internal_fn.redrawAxis = function (transitions, isHidden) {
// rotate tick text if needed
if (!config.axis_rotated && config.axis_x_tick_rotate) {
$$.rotateTickText($$.axes.x, transitions.axisX, config.axis_x_tick_rotate);
$$.rotateTickText($$.axes.subx, transitions.axisSubX, config.axis_x_tick_rotate);
}
};

4
src/drag.js
Unescape View File

@ -65,7 +65,7 @@ c3_chart_internal_fn.dragstart = function (mouse) {
.attr('class', CLASS.dragarea)
.style('opacity', 0.1);
$$.dragging = true;
$$.config.data_ondragstart();
$$.config.data_ondragstart.call($$.api);
};
c3_chart_internal_fn.dragend = function () {
@ -79,6 +79,6 @@ c3_chart_internal_fn.dragend = function () {
$$.main.selectAll('.' + CLASS.shape)
.classed(CLASS.INCLUDED, false);
$$.dragging = false;
$$.config.data_ondragend();
$$.config.data_ondragend.call($$.api);
};

8
src/interaction.js
Unescape View File

@ -142,7 +142,7 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
// Call event handler
$$.main.selectAll('.' + CLASS.shape + '-' + index).each(function (d) {
config.data_onmouseover.call($$, d);
config.data_onmouseover.call($$.api, d);
});
})
.on('mouseout', function (d) {
@ -155,7 +155,7 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
$$.unexpandBars();
// Call event handler
$$.main.selectAll('.' + CLASS.shape + '-' + index).each(function (d) {
config.data_onmouseout.call($$, d);
config.data_onmouseout.call($$.api, d);
});
})
.on('mousemove', function (d) {
@ -270,7 +270,7 @@ c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter)
closest = $$.findClosestFromTargets(targetsToShow, mouse);
if ($$.mouseover && (!closest || closest.id !== $$.mouseover.id)) {
config.data_onmouseout.call($$, $$.mouseover);
config.data_onmouseout.call($$.api, $$.mouseover);
$$.mouseover = undefined;
}
@ -304,7 +304,7 @@ c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter)
if ($$.isBarType(closest.id) || $$.dist(closest, mouse) < 100) {
$$.svg.select('.' + CLASS.eventRect).style('cursor', 'pointer');
if (!$$.mouseover) {
config.data_onmouseover.call($$, closest);
config.data_onmouseover.call($$.api, closest);
$$.mouseover = closest;
}
}

5
src/subchart.js
Unescape View File

@ -99,11 +99,6 @@ c3_chart_internal_fn.redrawSubchart = function (withSubchart, transitions, durat
// update subchart elements if needed
if (withSubchart) {
// rotate tick text if needed
if (!config.axis_rotated && config.axis_x_tick_rotate) {
$$.rotateTickText($$.axes.subx, transitions.axisSubX, config.axis_x_tick_rotate);
}
// extent rect
if (!$$.brush.empty()) {
$$.brush.extent($$.x.orgDomain()).update();

Write Preview
Loading…
Cancel
Save