Fix timeseries for d3.v4

7 years ago · 1a10d6b451
6 changed files with 7 additions and 8 deletions
--- 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({
--- 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({
--- 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',
--- 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>

--- 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)) {
--- 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,