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
f028072c
Commit
f028072c
authored
Oct 11, 2014
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Plain Diff
Fix conflict
parents
1e550608
708c9d59
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
0 deletions
+12
-0
c3.js
c3.js
+6
-0
c3.min.js
c3.min.js
+0
-0
config.js
src/config.js
+2
-0
zoom.js
src/zoom.js
+4
-0
No files found.
c3.js
View file @
f028072c
...
...
@@ -890,6 +890,8 @@
zoom_extent
:
undefined
,
zoom_privileged
:
false
,
zoom_onzoom
:
function
()
{},
zoom_onzoomstart
:
function
()
{},
zoom_onzoomend
:
function
()
{},
interaction_enabled
:
true
,
onmouseover
:
function
()
{},
onmouseout
:
function
()
{},
...
...
@@ -5025,6 +5027,7 @@
$$
.
zoom
=
d3
.
behavior
.
zoom
()
.
on
(
"zoomstart"
,
function
()
{
$$
.
zoom
.
altDomain
=
d3
.
event
.
sourceEvent
.
altKey
?
$$
.
x
.
orgDomain
()
:
null
;
config
.
zoom_onzoomstart
.
call
(
$$
.
api
,
d3
.
event
.
sourceEvent
);
})
.
on
(
"zoom"
,
function
()
{
// prevZoomTranslate is needed for the fix of unexpected zoom.translate after remaining zoom
...
...
@@ -5034,6 +5037,9 @@
$$
.
redrawForZoom
.
call
(
$$
);
prevZoomTranslate
=
$$
.
zoom
.
translate
();
wheeled
=
d3
.
event
.
sourceEvent
.
type
===
'wheel'
;
})
.
on
(
'zoomend'
,
function
()
{
config
.
zoom_onzoomend
.
call
(
$$
.
api
,
$$
.
x
.
orgDomain
());
});
$$
.
zoom
.
scale
=
function
(
scale
)
{
return
config
.
axis_rotated
?
this
.
y
(
scale
)
:
this
.
x
(
scale
);
...
...
c3.min.js
View file @
f028072c
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/config.js
View file @
f028072c
...
...
@@ -11,6 +11,8 @@ c3_chart_internal_fn.getDefaultConfig = function () {
zoom_extent
:
undefined
,
zoom_privileged
:
false
,
zoom_onzoom
:
function
()
{},
zoom_onzoomstart
:
function
()
{},
zoom_onzoomend
:
function
()
{},
interaction_enabled
:
true
,
onmouseover
:
function
()
{},
onmouseout
:
function
()
{},
...
...
src/zoom.js
View file @
f028072c
...
...
@@ -4,6 +4,7 @@ c3_chart_internal_fn.initZoom = function () {
$$
.
zoom
=
d3
.
behavior
.
zoom
()
.
on
(
"zoomstart"
,
function
()
{
$$
.
zoom
.
altDomain
=
d3
.
event
.
sourceEvent
.
altKey
?
$$
.
x
.
orgDomain
()
:
null
;
config
.
zoom_onzoomstart
.
call
(
$$
.
api
,
d3
.
event
.
sourceEvent
);
})
.
on
(
"zoom"
,
function
()
{
// prevZoomTranslate is needed for the fix of unexpected zoom.translate after remaining zoom
...
...
@@ -13,6 +14,9 @@ c3_chart_internal_fn.initZoom = function () {
$$
.
redrawForZoom
.
call
(
$$
);
prevZoomTranslate
=
$$
.
zoom
.
translate
();
wheeled
=
d3
.
event
.
sourceEvent
.
type
===
'wheel'
;
})
.
on
(
'zoomend'
,
function
()
{
config
.
zoom_onzoomend
.
call
(
$$
.
api
,
$$
.
x
.
orgDomain
());
});
$$
.
zoom
.
scale
=
function
(
scale
)
{
return
config
.
axis_rotated
?
this
.
y
(
scale
)
:
this
.
x
(
scale
);
...
...
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