From 1a10d6b451fb3fc1b3c474ccb61f9d38c29f4b7b Mon Sep 17 00:00:00 2001
From: Masayuki Tanaka <masayuki0812@mac.com>
Date: Fri, 5 Jan 2018 17:46:02 +0900
Subject: [PATCH] Fix timeseries for d3.v4

---
 htdocs/samples/timeseries.html            | 2 +-
 htdocs/samples/timeseries_date.html       | 2 +-
 htdocs/samples/timeseries_descendent.html | 3 +--
 htdocs/samples/timeseries_raw.html        | 2 +-
 src/core.js                               | 4 ++--
 src/scale.js                              | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/htdocs/samples/timeseries.html b/htdocs/samples/timeseries.html
index af1265c..b01f9bd 100644
--- a/htdocs/samples/timeseries.html
+++ b/htdocs/samples/timeseries.html
@@ -5,7 +5,7 @@
   <body>
     <div id="chart"></div>
 
-    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="http://d3js.org/d3.v4.min.js" charset="utf-8"></script>
     <script src="/js/c3.js"></script>
     <script>
       var chart = c3.generate({
diff --git a/htdocs/samples/timeseries_date.html b/htdocs/samples/timeseries_date.html
index ceb8e2f..5ce6ee3 100644
--- a/htdocs/samples/timeseries_date.html
+++ b/htdocs/samples/timeseries_date.html
@@ -5,7 +5,7 @@
   <body>
     <div id="chart"></div>
 
-    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="http://d3js.org/d3.v4.min.js" charset="utf-8"></script>
     <script src="/js/c3.js"></script>
     <script>
       var chart = c3.generate({
diff --git a/htdocs/samples/timeseries_descendent.html b/htdocs/samples/timeseries_descendent.html
index 58246f6..96135c9 100644
--- a/htdocs/samples/timeseries_descendent.html
+++ b/htdocs/samples/timeseries_descendent.html
@@ -5,9 +5,8 @@
   <body>
     <div id="chart"></div>
 
-    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="http://d3js.org/d3.v4.min.js" charset="utf-8"></script>
     <script src="/js/c3.js"></script>
-<!--    <script src="/js/c3.min.0.1.35.js"></script>-->
     <script>
 
       var dates = ['date',
diff --git a/htdocs/samples/timeseries_raw.html b/htdocs/samples/timeseries_raw.html
index 06d61f3..58b73a1 100644
--- a/htdocs/samples/timeseries_raw.html
+++ b/htdocs/samples/timeseries_raw.html
@@ -5,7 +5,7 @@
   <body>
     <div id="chart"></div>
 
-    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="http://d3js.org/d3.v4.min.js" charset="utf-8"></script>
     <script src="/js/c3.js"></script>
     <script>
 
diff --git a/src/core.js b/src/core.js
index 54e8000..078e4eb 100644
--- a/src/core.js
+++ b/src/core.js
@@ -107,7 +107,7 @@ c3_chart_internal_fn.initParams = function () {
     $$.color = $$.generateColor();
     $$.levelColor = $$.generateLevelColor();
 
-    $$.dataTimeFormat = config.data_xLocaltime ? d3.timeFormat : d3.utcFormat;
+    $$.dataTimeParse = (config.data_xLocaltime ? d3.timeParse : d3.utcParse)($$.config.data_xFormat);
     $$.axisTimeFormat = config.axis_x_localtime ? d3.timeFormat : d3.utcFormat;
     $$.defaultAxisTimeFormat = function (date) {
         if (date.getMilliseconds()) { return d3.timeFormat(".%L")(date); }
@@ -1030,7 +1030,7 @@ c3_chart_internal_fn.parseDate = function (date) {
     if (date instanceof Date) {
         parsedDate = date;
     } else if (typeof date === 'string') {
-        parsedDate = $$.dataTimeFormat($$.config.data_xFormat).parse(date);
+        parsedDate = $$.dataTimeParse(date);
     } else if (typeof date === 'object') {
         parsedDate = new Date(+date);
     } else if (typeof date === 'number' && !isNaN(date)) {
diff --git a/src/scale.js b/src/scale.js
index 480bdb4..83dda04 100644
--- a/src/scale.js
+++ b/src/scale.js
@@ -1,7 +1,7 @@
 import { c3_chart_internal_fn } from './core';
 
 c3_chart_internal_fn.getScale = function (min, max, forTimeseries) {
-    return (forTimeseries ? this.d3.time.scale() : this.d3.scaleLinear()).range([min, max]);
+    return (forTimeseries ? this.d3.scaleTime() : this.d3.scaleLinear()).range([min, max]);
 };
 c3_chart_internal_fn.getX = function (min, max, domain, offset) {
     var $$ = this,
