Skip to content

C
c3-closed
Commit 08a50b53 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix conflict

parents 0efe6d77 18a39d58
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
c3.js
View file @ 08a50b53
...@@ -1257,6 +1257,8 @@ ...@@ -1257,6 +1257,8 @@
tooltip_init_show: false, tooltip_init_show: false,
tooltip_init_x: 0, tooltip_init_x: 0,
tooltip_init_position: {top: '0px', left: '50px'}, tooltip_init_position: {top: '0px', left: '50px'},
tooltip_onshow: function () {},
tooltip_onhide: function () {},
// title // title
title_text: undefined, title_text: undefined,
title_padding: { title_padding: {
...@@ -6856,10 +6858,14 @@ ...@@ -6856,10 +6858,14 @@
// emulate mouse events to show // emulate mouse events to show
$$.dispatchEvent('mouseover', index, mouse); $$.dispatchEvent('mouseover', index, mouse);
$$.dispatchEvent('mousemove', index, mouse); $$.dispatchEvent('mousemove', index, mouse);
this.config.tooltip_onshow.call($$, args.data);
}; };
c3_chart_fn.tooltip.hide = function () { c3_chart_fn.tooltip.hide = function () {
// TODO: get target data by checking the state of focus // TODO: get target data by checking the state of focus
this.internal.dispatchEvent('mouseout', 0); this.internal.dispatchEvent('mouseout', 0);
this.config.tooltip_onhide.call(this);
}; };
// Features: // Features:
......
c3.min.js
View file @ 08a50b53
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api.tooltip.js
View file @ 08a50b53
...@@ -28,8 +28,12 @@ c3_chart_fn.tooltip.show = function (args) { ...@@ -28,8 +28,12 @@ c3_chart_fn.tooltip.show = function (args) {
// emulate mouse events to show // emulate mouse events to show
$$.dispatchEvent('mouseover', index, mouse); $$.dispatchEvent('mouseover', index, mouse);
$$.dispatchEvent('mousemove', index, mouse); $$.dispatchEvent('mousemove', index, mouse);
this.config.tooltip_onshow.call($$, args.data);
}; };
c3_chart_fn.tooltip.hide = function () { c3_chart_fn.tooltip.hide = function () {
// TODO: get target data by checking the state of focus // TODO: get target data by checking the state of focus
this.internal.dispatchEvent('mouseout', 0); this.internal.dispatchEvent('mouseout', 0);
this.config.tooltip_onhide.call(this);
}; };
src/config.js
View file @ 08a50b53
...@@ -203,6 +203,8 @@ c3_chart_internal_fn.getDefaultConfig = function () { ...@@ -203,6 +203,8 @@ c3_chart_internal_fn.getDefaultConfig = function () {
tooltip_init_show: false, tooltip_init_show: false,
tooltip_init_x: 0, tooltip_init_x: 0,
tooltip_init_position: {top: '0px', left: '50px'}, tooltip_init_position: {top: '0px', left: '50px'},
tooltip_onshow: function () {},
tooltip_onhide: function () {},
// title // title
title_text: undefined, title_text: undefined,
title_padding: { title_padding: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment