playground
/
c3
mirror of https://github.com/masayuki0812/c3.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix tick format for timeseries

pull/486/head
Masayuki Tanaka 11 years ago
parent
5ef894aacf
commit
1669ec46e0
3 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      c3.js
  2. 2
      c3.min.js
  3. 4
      src/axis.js

4
c3.js
Unescape View File

@ -3916,7 +3916,7 @@
var $$ = this, config = $$.config, var $$ = this, config = $$.config,
format = $$.isTimeSeries() ? $$.defaultAxisTimeFormat : $$.isCategorized() ? $$.categoryName : function (v) { return v < 0 ? v.toFixed(0) : v; }; format = $$.isTimeSeries() ? $$.defaultAxisTimeFormat : $$.isCategorized() ? $$.categoryName : function (v) { return v < 0 ? v.toFixed(0) : v; };
if (config[__axis_x_tick_format]) { if (config[__axis_x_tick_format]) {
if (config[__axis_x_tick_format]) { if (isFunction(config[__axis_x_tick_format])) {
format = config[__axis_x_tick_format]; format = config[__axis_x_tick_format];
} else if ($$.isTimeSeries()) { } else if ($$.isTimeSeries()) {
format = function (date) { format = function (date) {
@ -3924,7 +3924,7 @@
}; };
} }
} }
return function (v) { return format.call($$, v); }; return isFunction(format) ? function (v) { return format.call($$, v); } : format;
}; };
c3_chart_internal_fn.getAxisLabelOptionByAxisId = function (axisId) { c3_chart_internal_fn.getAxisLabelOptionByAxisId = function (axisId) {
var $$ = this, config = $$.config, option; var $$ = this, config = $$.config, option;

2
c3.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/axis.js
Unescape View File

@ -63,7 +63,7 @@ c3_chart_internal_fn.getXAxisTickFormat = function () {
var $$ = this, config = $$.config, var $$ = this, config = $$.config,
format = $$.isTimeSeries() ? $$.defaultAxisTimeFormat : $$.isCategorized() ? $$.categoryName : function (v) { return v < 0 ? v.toFixed(0) : v; }; format = $$.isTimeSeries() ? $$.defaultAxisTimeFormat : $$.isCategorized() ? $$.categoryName : function (v) { return v < 0 ? v.toFixed(0) : v; };
if (config[__axis_x_tick_format]) { if (config[__axis_x_tick_format]) {
if (config[__axis_x_tick_format]) { if (isFunction(config[__axis_x_tick_format])) {
format = config[__axis_x_tick_format]; format = config[__axis_x_tick_format];
} else if ($$.isTimeSeries()) { } else if ($$.isTimeSeries()) {
format = function (date) { format = function (date) {
@ -71,7 +71,7 @@ c3_chart_internal_fn.getXAxisTickFormat = function () {
}; };
} }
} }
return function (v) { return format.call($$, v); }; return isFunction(format) ? function (v) { return format.call($$, v); } : format;
}; };
c3_chart_internal_fn.getAxisLabelOptionByAxisId = function (axisId) { c3_chart_internal_fn.getAxisLabelOptionByAxisId = function (axisId) {
var $$ = this, config = $$.config, option; var $$ = this, config = $$.config, option;

Write Preview
Loading…
Cancel
Save