Merge pull request #1100 from mlzummo/C3_TIME_FIX_1.6.8

GordonSmith · GordonSmith · commit 543c164bed26 · 2015-10-28T15:11:32.000Z
GH-1080 Fix C3 Time Axis
diff --git a/src/c3chart/CommonND.js b/src/c3chart/CommonND.js
@@ -149,7 +149,7 @@
         
         this.c3Chart.internal.config.axis_y_tick_format = this.yAxisTickFormat() ? d3.format(this.yAxisTickFormat()) : undefined;
         if (this.xAxisType() === "time") {
-            this.c3Chart.internal.config.axis_x_tick_format = this.xAxisTickFormat() ? d3.time.format(this.xAxisTickFormat()) : undefined;
+            this.c3Chart.internal.config.axis_x_tick_format = this.xAxisTickFormat() ? d3.time.format(this.xAxisTickFormat()) : "%Y-%m-%d %I:%M:%S %p";
         } else {
             this.c3Chart.internal.config.axis_x_tick_format = this.xAxisTickFormat() ? d3.format(this.xAxisTickFormat()) : undefined;
         }

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@`
`149`	`149`
`150`	`150`	`this.c3Chart.internal.config.axis_y_tick_format = this.yAxisTickFormat() ? d3.format(this.yAxisTickFormat()) : undefined;`
`151`	`151`	`if (this.xAxisType() === "time") {`
`152`		`- this.c3Chart.internal.config.axis_x_tick_format = this.xAxisTickFormat() ? d3.time.format(this.xAxisTickFormat()) : undefined;`
	`152`	`+ this.c3Chart.internal.config.axis_x_tick_format = this.xAxisTickFormat() ? d3.time.format(this.xAxisTickFormat()) : "%Y-%m-%d %I:%M:%S %p";`
`153`	`153`	`} else {`
`154`	`154`	`this.c3Chart.internal.config.axis_x_tick_format = this.xAxisTickFormat() ? d3.format(this.xAxisTickFormat()) : undefined;`
`155`	`155`	`}`