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
6277e83c
Commit
6277e83c
authored
Oct 19, 2014
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support date for zoom API
parent
439e00f6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
83 additions
and
18 deletions
+83
-18
c3.js
c3.js
+8
-2
c3.min.js
c3.min.js
+0
-0
api.zoom-spec.js
spec/api.zoom-spec.js
+67
-14
api.zoom.js
src/api.zoom.js
+8
-2
No files found.
c3.js
View file @
6277e83c
...
@@ -5535,8 +5535,14 @@
...
@@ -5535,8 +5535,14 @@
c3_chart_fn
.
zoom
=
function
(
domain
)
{
c3_chart_fn
.
zoom
=
function
(
domain
)
{
var
$$
=
this
.
internal
;
var
$$
=
this
.
internal
;
$$
.
brush
.
extent
(
domain
);
if
(
domain
)
{
$$
.
redraw
({
withUpdateXDomain
:
true
});
if
(
$$
.
isTimeSeries
())
{
domain
=
domain
.
map
(
function
(
x
)
{
return
$$
.
parseDate
(
x
);
});
}
$$
.
brush
.
extent
(
domain
);
$$
.
redraw
({
withUpdateXDomain
:
true
});
}
return
$$
.
brush
.
extent
();
};
};
c3_chart_fn
.
zoom
.
enable
=
function
(
enabled
)
{
c3_chart_fn
.
zoom
.
enable
=
function
(
enabled
)
{
var
$$
=
this
.
internal
;
var
$$
=
this
.
internal
;
...
...
c3.min.js
View file @
6277e83c
This source diff could not be displayed because it is too large. You can
view the blob
instead.
spec/api.zoom-spec.js
View file @
6277e83c
...
@@ -37,35 +37,88 @@ describe('c3 api zoom', function () {
...
@@ -37,35 +37,88 @@ describe('c3 api zoom', function () {
describe
(
'zoom'
,
function
()
{
describe
(
'zoom'
,
function
()
{
it
(
'should be zoomed properly'
,
function
()
{
it
(
'should be zoomed properly'
,
function
()
{
chart
.
zoom
([
3
,
5
]);
var
target
=
[
3
,
5
],
domain
;
var
domain
=
chart
.
internal
.
x
.
domain
();
chart
.
zoom
(
target
);
expect
(
domain
[
0
]).
toBe
(
3
);
domain
=
chart
.
internal
.
x
.
domain
();
expect
(
domain
[
1
]).
toBe
(
5
);
expect
(
domain
[
0
]).
toBe
(
target
[
0
]);
expect
(
domain
[
1
]).
toBe
(
target
[
1
]);
});
});
it
(
'should be zoomed properly again'
,
function
()
{
it
(
'should be zoomed properly again'
,
function
()
{
chart
.
zoom
([
1
,
4
]);
var
target
=
[
1
,
4
],
domain
;
var
domain
=
chart
.
internal
.
x
.
domain
();
chart
.
zoom
(
target
);
expect
(
domain
[
0
]).
toBe
(
1
);
domain
=
chart
.
internal
.
x
.
domain
();
expect
(
domain
[
1
]).
toBe
(
4
);
expect
(
domain
[
0
]).
toBe
(
target
[
0
]);
expect
(
domain
[
1
]).
toBe
(
target
[
1
]);
});
it
(
'should load timeseries data'
,
function
()
{
args
=
{
data
:
{
x
:
'date'
,
columns
:
[
[
'date'
,
'2014-01-01'
,
'2014-01-02'
,
'2014-08-01'
,
'2014-10-19'
],
[
'data1'
,
30
,
200
,
100
,
400
]
]
},
axis
:
{
x
:
{
type
:
'timeseries'
}
},
zoom
:
{
enabled
:
true
}
};
expect
(
true
).
toBeTruthy
();
});
it
(
'should be zoomed properly'
,
function
()
{
var
target
=
[
new
Date
(
2014
,
7
,
1
),
new
Date
(
2014
,
8
,
1
)],
domain
;
chart
.
zoom
(
target
);
domain
=
chart
.
internal
.
x
.
domain
();
expect
(
+
domain
[
0
]).
toBe
(
+
target
[
0
]);
expect
(
+
domain
[
1
]).
toBe
(
+
target
[
1
]);
});
it
(
'should be zoomed properly'
,
function
()
{
var
target
=
[
'2014-08-01'
,
'2014-09-01'
],
domain
;
chart
.
zoom
(
target
);
domain
=
chart
.
internal
.
x
.
domain
();
expect
(
+
domain
[
0
]).
toBe
(
+
chart
.
internal
.
parseDate
(
target
[
0
]));
expect
(
+
domain
[
1
]).
toBe
(
+
chart
.
internal
.
parseDate
(
target
[
1
]));
});
});
});
});
describe
(
'unzoom'
,
function
()
{
describe
(
'unzoom'
,
function
()
{
it
(
'should load indexed data'
,
function
()
{
args
=
{
data
:
{
columns
:
[
[
'data1'
,
30
,
200
,
100
,
400
,
150
,
250
]
]
},
zoom
:
{
enabled
:
true
}
};
expect
(
true
).
toBeTruthy
();
});
it
(
'should be unzoomed properly'
,
function
()
{
it
(
'should be unzoomed properly'
,
function
()
{
var
domain
;
var
target
=
[
1
,
4
],
orginal
=
chart
.
internal
.
x
.
domain
(),
domain
;
chart
.
zoom
(
[
1
,
4
]
);
chart
.
zoom
(
target
);
domain
=
chart
.
internal
.
x
.
domain
();
domain
=
chart
.
internal
.
x
.
domain
();
expect
(
domain
[
0
]).
toBe
(
1
);
expect
(
domain
[
0
]).
toBe
(
target
[
0
]
);
expect
(
domain
[
1
]).
toBe
(
4
);
expect
(
domain
[
1
]).
toBe
(
target
[
1
]
);
chart
.
unzoom
();
chart
.
unzoom
();
domain
=
chart
.
internal
.
x
.
domain
();
domain
=
chart
.
internal
.
x
.
domain
();
expect
(
domain
[
0
]).
toBe
(
-
0.05
);
expect
(
domain
[
0
]).
toBe
(
orginal
[
0
]
);
expect
(
domain
[
1
]).
toBe
(
5.05
);
expect
(
domain
[
1
]).
toBe
(
orginal
[
1
]
);
});
});
});
});
...
...
src/api.zoom.js
View file @
6277e83c
c3_chart_fn
.
zoom
=
function
(
domain
)
{
c3_chart_fn
.
zoom
=
function
(
domain
)
{
var
$$
=
this
.
internal
;
var
$$
=
this
.
internal
;
$$
.
brush
.
extent
(
domain
);
if
(
domain
)
{
$$
.
redraw
({
withUpdateXDomain
:
true
});
if
(
$$
.
isTimeSeries
())
{
domain
=
domain
.
map
(
function
(
x
)
{
return
$$
.
parseDate
(
x
);
});
}
$$
.
brush
.
extent
(
domain
);
$$
.
redraw
({
withUpdateXDomain
:
true
});
}
return
$$
.
brush
.
extent
();
};
};
c3_chart_fn
.
zoom
.
enable
=
function
(
enabled
)
{
c3_chart_fn
.
zoom
.
enable
=
function
(
enabled
)
{
var
$$
=
this
.
internal
;
var
$$
=
this
.
internal
;
...
...
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