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
60114ee1
Commit
60114ee1
authored
Jun 10, 2014
by
Adam Bryzak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add localtime config for X axis data
parent
7cedbcb0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
c3.js
c3.js
+7
-5
c3.min.js
c3.min.js
+0
-0
No files found.
c3.js
View file @
60114ee1
...
...
@@ -143,6 +143,7 @@
var
__data_x
=
getConfig
([
'data'
,
'x'
]),
__data_xs
=
getConfig
([
'data'
,
'xs'
],
{}),
__data_x_format
=
getConfig
([
'data'
,
'x_format'
],
'%Y-%m-%d'
),
__data_x_localtime
=
getConfig
([
'data'
,
'x_localtime'
],
true
),
__data_id_converter
=
getConfig
([
'data'
,
'id_converter'
],
function
(
id
)
{
return
id
;
}),
__data_names
=
getConfig
([
'data'
,
'names'
],
{}),
__data_classes
=
getConfig
([
'data'
,
'classes'
],
{}),
...
...
@@ -346,8 +347,9 @@
color
=
generateColor
(
__data_colors
,
notEmpty
(
__color_pattern
)
?
__color_pattern
:
defaultColorPattern
,
__data_color
),
levelColor
=
notEmpty
(
__color_threshold
)
?
generateLevelColor
(
__color_pattern
,
__color_threshold
)
:
null
;
var
timeFormat
=
__axis_x_localtime
?
d3
.
time
.
format
:
d3
.
time
.
format
.
utc
,
defaultTimeFormat
=
timeFormat
.
multi
([
var
dataTimeFormat
=
__data_x_localtime
?
d3
.
time
.
format
:
d3
.
time
.
format
.
utc
,
axisTimeFormat
=
__axis_x_localtime
?
d3
.
time
.
format
:
d3
.
time
.
format
.
utc
,
defaultAxisTimeFormat
=
axisTimeFormat
.
multi
([
[
".%L"
,
function
(
d
)
{
return
d
.
getMilliseconds
();
}],
[
":%S"
,
function
(
d
)
{
return
d
.
getSeconds
();
}],
[
"%I:%M"
,
function
(
d
)
{
return
d
.
getMinutes
();
}],
...
...
@@ -808,13 +810,13 @@
return
id
in
__data_axes
?
__data_axes
[
id
]
:
'y'
;
}
function
getXAxisTickFormat
()
{
var
format
=
isTimeSeries
?
defaultTimeFormat
:
isCategorized
?
categoryName
:
function
(
v
)
{
return
v
<
0
?
v
.
toFixed
(
0
)
:
v
;
};
var
format
=
isTimeSeries
?
default
Axis
TimeFormat
:
isCategorized
?
categoryName
:
function
(
v
)
{
return
v
<
0
?
v
.
toFixed
(
0
)
:
v
;
};
if
(
__axis_x_tick_format
)
{
if
(
typeof
__axis_x_tick_format
===
'function'
)
{
format
=
__axis_x_tick_format
;
}
else
if
(
isTimeSeries
)
{
format
=
function
(
date
)
{
return
date
?
t
imeFormat
(
__axis_x_tick_format
)(
date
)
:
""
;
return
date
?
axisT
imeFormat
(
__axis_x_tick_format
)(
date
)
:
""
;
};
}
}
...
...
@@ -2333,7 +2335,7 @@
parsedDate
=
date
;
}
else
{
try
{
parsedDate
=
typeof
date
===
'number'
?
new
Date
(
date
)
:
d
3
.
time
.
f
ormat
(
__data_x_format
).
parse
(
date
);
parsedDate
=
typeof
date
===
'number'
?
new
Date
(
date
)
:
d
ataTimeF
ormat
(
__data_x_format
).
parse
(
date
);
}
catch
(
e
)
{
window
.
console
.
error
(
"Failed to parse x '"
+
date
+
"' to Date with format "
+
__data_x_format
);
}
...
...
c3.min.js
View file @
60114ee1
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