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
b845e848
Commit
b845e848
authored
Oct 29, 2013
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix zoom extent logic
parent
85fcd0a6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
c3.js
c3.js
+9
-8
c3.min.js
c3.min.js
+0
-0
No files found.
c3.js
View file @
b845e848
...
@@ -33,8 +33,7 @@
...
@@ -33,8 +33,7 @@
var
__size_width
=
getConfig
([
'size'
,
'width'
],
null
),
var
__size_width
=
getConfig
([
'size'
,
'width'
],
null
),
__size_height
=
getConfig
([
'size'
,
'height'
],
null
);
__size_height
=
getConfig
([
'size'
,
'height'
],
null
);
var
__zoom_enabled
=
getConfig
([
'zoom'
,
'enabled'
],
false
),
var
__zoom_enabled
=
getConfig
([
'zoom'
,
'enabled'
],
false
);
__zoom_extent
=
getConfig
([
'zoom'
,
'extent'
],
[
1
,
10
]);
// data - data configuration
// data - data configuration
checkConfig
(
'data'
,
'data is required in config'
);
checkConfig
(
'data'
,
'data is required in config'
);
...
@@ -797,19 +796,21 @@
...
@@ -797,19 +796,21 @@
//-- Define brush/zoom -//
//-- Define brush/zoom -//
var
brush
=
d3
.
svg
.
brush
().
on
(
"brush"
,
redrawForBrush
);
var
brush
=
d3
.
svg
.
brush
().
on
(
"brush"
,
redrawForBrush
);
var
zoom
=
d3
.
behavior
.
zoom
().
on
(
"zoomstart"
,
function
(){
zoom
.
altDomain
=
d3
.
event
.
sourceEvent
.
altKey
?
x
.
orgDomain
()
:
null
;
}).
on
(
"zoom"
,
__zoom_enabled
?
redrawForZoom
:
null
)
.
scaleExtent
(
__zoom_extent
)
;
var
zoom
=
d3
.
behavior
.
zoom
().
on
(
"zoomstart"
,
function
(){
zoom
.
altDomain
=
d3
.
event
.
sourceEvent
.
altKey
?
x
.
orgDomain
()
:
null
;
}).
on
(
"zoom"
,
__zoom_enabled
?
redrawForZoom
:
null
);
// define functions for c3
// define functions for c3
brush
.
update
=
function
()
{
brush
.
update
=
function
()
{
if
(
context
)
context
.
select
(
'.x.brush'
).
call
(
this
);
if
(
context
)
context
.
select
(
'.x.brush'
).
call
(
this
);
return
this
;
return
this
;
}
};
zoom
.
orgScaleExtent
=
zoom
.
scaleExtent
();
zoom
.
orgScaleExtent
=
function
()
{
return
[
1
,
Math
.
max
(
maxDataCount
()
/
10
,
10
)];
};
zoom
.
updateScaleExtent
=
function
()
{
zoom
.
updateScaleExtent
=
function
()
{
var
ratio
=
diffDomain
(
x
.
orgDomain
())
/
diffDomain
(
orgXDomain
);
var
ratio
=
diffDomain
(
x
.
orgDomain
())
/
diffDomain
(
orgXDomain
)
,
extent
=
this
.
orgScaleExtent
()
;
this
.
scaleExtent
([
this
.
orgScaleExtent
[
0
]
*
ratio
,
this
.
orgScaleE
xtent
[
1
]
*
ratio
]);
this
.
scaleExtent
([
extent
[
0
]
*
ratio
,
e
xtent
[
1
]
*
ratio
]);
return
this
;
return
this
;
}
}
;
/*-- Draw Chart --*/
/*-- Draw Chart --*/
...
...
c3.min.js
View file @
b845e848
This diff is collapsed.
Click to expand it.
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