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
d7b7b064
Commit
d7b7b064
authored
Jun 06, 2014
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug for raw timeseries input again - #311
parent
916074d3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
c3.js
c3.js
+6
-12
c3.min.js
c3.min.js
+0
-0
No files found.
c3.js
View file @
d7b7b064
...
@@ -1465,17 +1465,7 @@
...
@@ -1465,17 +1465,7 @@
function
generateTargetX
(
rawX
,
id
,
index
)
{
function
generateTargetX
(
rawX
,
id
,
index
)
{
var
x
;
var
x
;
if
(
isTimeSeries
)
{
if
(
isTimeSeries
)
{
if
(
rawX
)
{
x
=
rawX
?
parseDate
(
rawX
)
:
parseDate
(
getXValue
(
id
,
index
));
if
(
typeof
rawX
===
'number'
)
{
x
=
new
Date
(
rawX
);
}
else
if
(
rawX
instanceof
Date
)
{
x
=
rawX
;
}
else
{
x
=
parseDate
(
rawX
);
}
}
else
{
x
=
parseDate
(
getXValue
(
id
,
index
));
}
}
}
else
if
(
isCustomX
()
&&
!
isCategorized
)
{
else
if
(
isCustomX
()
&&
!
isCategorized
)
{
x
=
isValue
(
rawX
)
?
+
rawX
:
getXValue
(
id
,
index
);
x
=
isValue
(
rawX
)
?
+
rawX
:
getXValue
(
id
,
index
);
...
@@ -2293,11 +2283,15 @@
...
@@ -2293,11 +2283,15 @@
function
parseDate
(
date
)
{
function
parseDate
(
date
)
{
var
parsedDate
;
var
parsedDate
;
if
(
date
instanceof
Date
)
{
parsedDate
=
date
;
}
else
{
try
{
try
{
parsedDate
=
date
instanceof
Date
?
new
Date
(
date
)
:
d3
.
time
.
format
(
__data_x_format
).
parse
(
date
);
parsedDate
=
typeof
date
===
'number'
?
new
Date
(
date
)
:
d3
.
time
.
format
(
__data_x_format
).
parse
(
date
);
}
catch
(
e
)
{
}
catch
(
e
)
{
window
.
console
.
error
(
"Failed to parse x '"
+
date
+
"' to Date with format "
+
__data_x_format
);
window
.
console
.
error
(
"Failed to parse x '"
+
date
+
"' to Date with format "
+
__data_x_format
);
}
}
}
return
parsedDate
;
return
parsedDate
;
}
}
...
...
c3.min.js
View file @
d7b7b064
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