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
Evgeny
c3-closed
Commits
0d9f1e2a
Commit
0d9f1e2a
authored
Aug 08, 2015
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update #1275
parent
4c193b03
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
12 deletions
+17
-12
c3.js
c3.js
+11
-1
c3.min.js
c3.min.js
+0
-0
shape.js
src/shape.js
+6
-11
No files found.
c3.js
View file @
0d9f1e2a
...
...
@@ -2796,7 +2796,17 @@
var
values
=
$$
.
isStepType
(
d
)
?
$$
.
convertValuesToStep
(
t
.
values
)
:
t
.
values
;
if
(
t
.
id
===
d
.
id
||
indices
[
t
.
id
]
!==
indices
[
d
.
id
])
{
return
;
}
if
(
targetIds
.
indexOf
(
t
.
id
)
<
targetIds
.
indexOf
(
d
.
id
))
{
if
(
values
[
i
].
value
*
d
.
value
>=
0
)
{
// check if the x values line up
if
(
typeof
values
[
i
]
===
'undefined'
||
values
[
i
].
x
!==
d
.
x
)
{
// if not, try to find the value that does line up
i
=
-
1
;
values
.
forEach
(
function
(
v
,
j
)
{
if
(
v
.
x
===
d
.
x
)
{
i
=
j
;
}
});
}
if
(
i
in
values
&&
values
[
i
].
value
*
d
.
value
>=
0
)
{
offset
+=
scale
(
values
[
i
].
value
)
-
y0
;
}
}
...
...
c3.min.js
View file @
0d9f1e2a
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/shape.js
View file @
0d9f1e2a
...
...
@@ -42,22 +42,17 @@ c3_chart_internal_fn.getShapeOffset = function (typeFilter, indices, isSub) {
if
(
t
.
id
===
d
.
id
||
indices
[
t
.
id
]
!==
indices
[
d
.
id
])
{
return
;
}
if
(
targetIds
.
indexOf
(
t
.
id
)
<
targetIds
.
indexOf
(
d
.
id
))
{
// check if the x values line up
if
(
typeof
values
[
i
]
===
'undefined'
||
(
values
[
i
].
x
!==
d
.
x
)
&&
(
values
[
i
].
x
-
d
.
x
!==
0
))
{
if
(
typeof
values
[
i
]
===
'undefined'
||
values
[
i
].
x
!==
d
.
x
)
{
// if not, try to find the value that does line up
i
=
-
1
;
for
(
var
j
in
values
)
{
if
(
(
values
[
j
].
x
===
d
.
x
)
||
(
values
[
j
].
x
-
d
.
x
===
0
)
)
{
values
.
forEach
(
function
(
v
,
j
)
{
if
(
v
.
x
===
d
.
x
)
{
i
=
j
;
break
;
}
}
}
);
}
if
(
i
in
values
)
{
if
(
values
[
i
].
value
*
d
.
value
>=
0
)
{
offset
+=
scale
(
values
[
i
].
value
)
-
y0
;
}
if
(
i
in
values
&&
values
[
i
].
value
*
d
.
value
>=
0
)
{
offset
+=
scale
(
values
[
i
].
value
)
-
y0
;
}
}
});
...
...
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