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
82cdf896
Commit
82cdf896
authored
Apr 10, 2014
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add axis.x.utc option and use utc for x time format as default - #144
parent
b87e6602
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
c3.js
c3.js
+12
-10
c3.min.js
c3.min.js
+0
-0
No files found.
c3.js
View file @
82cdf896
...
...
@@ -163,6 +163,7 @@
// axis
var
__axis_rotated
=
getConfig
([
'axis'
,
'rotated'
],
false
),
__axis_x_type
=
getConfig
([
'axis'
,
'x'
,
'type'
],
'indexed'
),
__axis_x_utc
=
getConfig
([
'axis'
,
'x'
,
'utc'
],
true
),
__axis_x_categories
=
getConfig
([
'axis'
,
'x'
,
'categories'
],
[]),
__axis_x_tick_centered
=
getConfig
([
'axis'
,
'x'
,
'tick'
,
'centered'
],
false
),
__axis_x_tick_format
=
getConfig
([
'axis'
,
'x'
,
'tick'
,
'format'
]),
...
...
@@ -281,16 +282,17 @@
var
defaultColorPattern
=
[
'#1f77b4'
,
'#ff7f0e'
,
'#2ca02c'
,
'#d62728'
,
'#9467bd'
,
'#8c564b'
,
'#e377c2'
,
'#7f7f7f'
,
'#bcbd22'
,
'#17becf'
],
//same as d3.scale.category10()
color
=
generateColor
(
__data_colors
,
notEmpty
(
__color_pattern
)
?
__color_pattern
:
defaultColorPattern
,
__data_color
);
var
defaultTimeFormat
=
(
function
()
{
var
xTimeFormat
=
__axis_x_utc
?
d3
.
time
.
format
.
utc
:
d3
.
time
.
format
,
defaultTimeFormat
=
(
function
()
{
var
formats
=
[
[
d3
.
time
.
f
ormat
(
"%Y/%-m/%-d"
),
function
()
{
return
true
;
}],
[
d3
.
time
.
f
ormat
(
"%-m/%-d"
),
function
(
d
)
{
return
d
.
getMonth
();
}],
[
d3
.
time
.
f
ormat
(
"%-m/%-d"
),
function
(
d
)
{
return
d
.
getDate
()
!==
1
;
}],
[
d3
.
time
.
f
ormat
(
"%-m/%-d"
),
function
(
d
)
{
return
d
.
getDay
()
&&
d
.
getDate
()
!==
1
;
}],
[
d3
.
time
.
f
ormat
(
"%I %p"
),
function
(
d
)
{
return
d
.
getHours
();
}],
[
d3
.
time
.
f
ormat
(
"%I:%M"
),
function
(
d
)
{
return
d
.
getMinutes
();
}],
[
d3
.
time
.
f
ormat
(
":%S"
),
function
(
d
)
{
return
d
.
getSeconds
();
}],
[
d3
.
time
.
f
ormat
(
".%L"
),
function
(
d
)
{
return
d
.
getMilliseconds
();
}]
[
xTimeF
ormat
(
"%Y/%-m/%-d"
),
function
()
{
return
true
;
}],
[
xTimeF
ormat
(
"%-m/%-d"
),
function
(
d
)
{
return
d
.
getMonth
();
}],
[
xTimeF
ormat
(
"%-m/%-d"
),
function
(
d
)
{
return
d
.
getDate
()
!==
1
;
}],
[
xTimeF
ormat
(
"%-m/%-d"
),
function
(
d
)
{
return
d
.
getDay
()
&&
d
.
getDate
()
!==
1
;
}],
[
xTimeF
ormat
(
"%I %p"
),
function
(
d
)
{
return
d
.
getHours
();
}],
[
xTimeF
ormat
(
"%I:%M"
),
function
(
d
)
{
return
d
.
getMinutes
();
}],
[
xTimeF
ormat
(
":%S"
),
function
(
d
)
{
return
d
.
getSeconds
();
}],
[
xTimeF
ormat
(
".%L"
),
function
(
d
)
{
return
d
.
getMilliseconds
();
}]
];
return
function
(
date
)
{
var
i
=
formats
.
length
-
1
,
f
=
formats
[
i
];
...
...
@@ -641,7 +643,7 @@
if
(
typeof
__axis_x_tick_format
===
'function'
)
{
format
=
__axis_x_tick_format
;
}
else
if
(
isTimeSeries
)
{
format
=
function
(
date
)
{
return
d3
.
time
.
f
ormat
(
__axis_x_tick_format
)(
date
);
};
format
=
function
(
date
)
{
return
xTimeF
ormat
(
__axis_x_tick_format
)(
date
);
};
}
}
return
format
;
...
...
c3.min.js
View file @
82cdf896
This source diff could not be displayed because it is too large. You can
view the blob
instead.
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