Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
c3-closed
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
charts
c3-closed
Commits
152412f0
Commit
152412f0
authored
Oct 13, 2014
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix mouse events when point.show = false - #575
parent
9485e614
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
c3.js
c3.js
+4
-4
c3.min.js
c3.min.js
+0
-0
core.js
src/core.js
+3
-3
shape.line.js
src/shape.line.js
+1
-1
No files found.
c3.js
View file @
152412f0
...
@@ -549,7 +549,7 @@
...
@@ -549,7 +549,7 @@
// lines, areas and cricles
// lines, areas and cricles
$$
.
redrawLine
(
durationForExit
);
$$
.
redrawLine
(
durationForExit
);
$$
.
redrawArea
(
durationForExit
);
$$
.
redrawArea
(
durationForExit
);
if
(
config
.
point_show
)
{
$$
.
redrawCircle
();
}
$$
.
redrawCircle
();
// text
// text
if
(
$$
.
hasDataLabel
())
{
if
(
$$
.
hasDataLabel
())
{
...
@@ -582,7 +582,7 @@
...
@@ -582,7 +582,7 @@
$$
.
addTransitionForBar
(
transitions
,
drawBar
);
$$
.
addTransitionForBar
(
transitions
,
drawBar
);
$$
.
addTransitionForLine
(
transitions
,
drawLine
);
$$
.
addTransitionForLine
(
transitions
,
drawLine
);
$$
.
addTransitionForArea
(
transitions
,
drawArea
);
$$
.
addTransitionForArea
(
transitions
,
drawArea
);
if
(
config
.
point_show
)
{
$$
.
addTransitionForCircle
(
transitions
,
cx
,
cy
);
}
$$
.
addTransitionForCircle
(
transitions
,
cx
,
cy
);
$$
.
addTransitionForText
(
transitions
,
xForText
,
yForText
,
options
.
flow
);
$$
.
addTransitionForText
(
transitions
,
xForText
,
yForText
,
options
.
flow
);
$$
.
addTransitionForRegion
(
transitions
);
$$
.
addTransitionForRegion
(
transitions
);
$$
.
addTransitionForGrid
(
transitions
);
$$
.
addTransitionForGrid
(
transitions
);
...
@@ -689,7 +689,7 @@
...
@@ -689,7 +689,7 @@
return
d
.
value
!==
null
&&
this
.
withoutFadeIn
[
d
.
id
]
?
1
:
0
;
return
d
.
value
!==
null
&&
this
.
withoutFadeIn
[
d
.
id
]
?
1
:
0
;
};
};
c3_chart_internal_fn
.
opacityForCircle
=
function
(
d
)
{
c3_chart_internal_fn
.
opacityForCircle
=
function
(
d
)
{
return
isValue
(
d
.
value
)
?
this
.
isScatterType
(
d
)
?
0.5
:
1
:
0
;
return
isValue
(
d
.
value
)
&&
this
.
config
.
point_show
?
(
this
.
isScatterType
(
d
)
?
0.5
:
1
)
:
0
;
};
};
c3_chart_internal_fn
.
opacityForText
=
function
()
{
c3_chart_internal_fn
.
opacityForText
=
function
()
{
return
this
.
hasDataLabel
()
?
1
:
0
;
return
this
.
hasDataLabel
()
?
1
:
0
;
...
@@ -2847,7 +2847,7 @@
...
@@ -2847,7 +2847,7 @@
};
};
c3_chart_internal_fn
.
pointR
=
function
(
d
)
{
c3_chart_internal_fn
.
pointR
=
function
(
d
)
{
var
$$
=
this
,
config
=
$$
.
config
;
var
$$
=
this
,
config
=
$$
.
config
;
return
config
.
point_show
&&
!
$$
.
isStepType
(
d
)
?
(
isFunction
(
config
.
point_r
)
?
config
.
point_r
(
d
)
:
config
.
point_r
)
:
0
;
return
$$
.
isStepType
(
d
)
?
0
:
(
isFunction
(
config
.
point_r
)
?
config
.
point_r
(
d
)
:
config
.
point_r
)
;
};
};
c3_chart_internal_fn
.
pointExpandedR
=
function
(
d
)
{
c3_chart_internal_fn
.
pointExpandedR
=
function
(
d
)
{
var
$$
=
this
,
config
=
$$
.
config
;
var
$$
=
this
,
config
=
$$
.
config
;
...
...
c3.min.js
View file @
152412f0
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/core.js
View file @
152412f0
...
@@ -544,7 +544,7 @@ c3_chart_internal_fn.redraw = function (options, transitions) {
...
@@ -544,7 +544,7 @@ c3_chart_internal_fn.redraw = function (options, transitions) {
// lines, areas and cricles
// lines, areas and cricles
$$
.
redrawLine
(
durationForExit
);
$$
.
redrawLine
(
durationForExit
);
$$
.
redrawArea
(
durationForExit
);
$$
.
redrawArea
(
durationForExit
);
if
(
config
.
point_show
)
{
$$
.
redrawCircle
();
}
$$
.
redrawCircle
();
// text
// text
if
(
$$
.
hasDataLabel
())
{
if
(
$$
.
hasDataLabel
())
{
...
@@ -577,7 +577,7 @@ c3_chart_internal_fn.redraw = function (options, transitions) {
...
@@ -577,7 +577,7 @@ c3_chart_internal_fn.redraw = function (options, transitions) {
$$
.
addTransitionForBar
(
transitions
,
drawBar
);
$$
.
addTransitionForBar
(
transitions
,
drawBar
);
$$
.
addTransitionForLine
(
transitions
,
drawLine
);
$$
.
addTransitionForLine
(
transitions
,
drawLine
);
$$
.
addTransitionForArea
(
transitions
,
drawArea
);
$$
.
addTransitionForArea
(
transitions
,
drawArea
);
if
(
config
.
point_show
)
{
$$
.
addTransitionForCircle
(
transitions
,
cx
,
cy
);
}
$$
.
addTransitionForCircle
(
transitions
,
cx
,
cy
);
$$
.
addTransitionForText
(
transitions
,
xForText
,
yForText
,
options
.
flow
);
$$
.
addTransitionForText
(
transitions
,
xForText
,
yForText
,
options
.
flow
);
$$
.
addTransitionForRegion
(
transitions
);
$$
.
addTransitionForRegion
(
transitions
);
$$
.
addTransitionForGrid
(
transitions
);
$$
.
addTransitionForGrid
(
transitions
);
...
@@ -684,7 +684,7 @@ c3_chart_internal_fn.initialOpacity = function (d) {
...
@@ -684,7 +684,7 @@ c3_chart_internal_fn.initialOpacity = function (d) {
return
d
.
value
!==
null
&&
this
.
withoutFadeIn
[
d
.
id
]
?
1
:
0
;
return
d
.
value
!==
null
&&
this
.
withoutFadeIn
[
d
.
id
]
?
1
:
0
;
};
};
c3_chart_internal_fn
.
opacityForCircle
=
function
(
d
)
{
c3_chart_internal_fn
.
opacityForCircle
=
function
(
d
)
{
return
isValue
(
d
.
value
)
?
this
.
isScatterType
(
d
)
?
0.5
:
1
:
0
;
return
isValue
(
d
.
value
)
&&
this
.
config
.
point_show
?
(
this
.
isScatterType
(
d
)
?
0.5
:
1
)
:
0
;
};
};
c3_chart_internal_fn
.
opacityForText
=
function
()
{
c3_chart_internal_fn
.
opacityForText
=
function
()
{
return
this
.
hasDataLabel
()
?
1
:
0
;
return
this
.
hasDataLabel
()
?
1
:
0
;
...
...
src/shape.line.js
View file @
152412f0
...
@@ -329,7 +329,7 @@ c3_chart_internal_fn.unexpandCircles = function (i) {
...
@@ -329,7 +329,7 @@ c3_chart_internal_fn.unexpandCircles = function (i) {
};
};
c3_chart_internal_fn
.
pointR
=
function
(
d
)
{
c3_chart_internal_fn
.
pointR
=
function
(
d
)
{
var
$$
=
this
,
config
=
$$
.
config
;
var
$$
=
this
,
config
=
$$
.
config
;
return
config
.
point_show
&&
!
$$
.
isStepType
(
d
)
?
(
isFunction
(
config
.
point_r
)
?
config
.
point_r
(
d
)
:
config
.
point_r
)
:
0
;
return
$$
.
isStepType
(
d
)
?
0
:
(
isFunction
(
config
.
point_r
)
?
config
.
point_r
(
d
)
:
config
.
point_r
)
;
};
};
c3_chart_internal_fn
.
pointExpandedR
=
function
(
d
)
{
c3_chart_internal_fn
.
pointExpandedR
=
function
(
d
)
{
var
$$
=
this
,
config
=
$$
.
config
;
var
$$
=
this
,
config
=
$$
.
config
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment