Skip to content

C
c3-closed
Commit c92bbb43 authored by michalkop93's avatar michalkop93
Browse files
Options

Changed axis.x.domain.min/max to zoom.x.min/max

parent 9eb84205
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 76 deletions
Gruntfile.coffee
View file @ c92bbb43
......@@ -65,7 +65,6 @@ module.exports = (grunt) ->
'src/api.color.js',
'src/api.x.js',
'src/api.axis.js',
'src/api.domain.js',
'src/api.legend.js',
'src/api.chart.js',
'src/api.tooltip.js',
......
c3.js
View file @ c92bbb43
......@@ -890,6 +890,8 @@
zoom_extent: undefined,
zoom_privileged: false,
zoom_onzoom: function () {},
zoom_x_min: undefined,
zoom_x_max: undefined,
interaction_enabled: true,
onmouseover: function () {},
onmouseout: function () {},
......@@ -974,8 +976,6 @@
axis_x_height: undefined,
axis_x_extent: undefined,
axis_x_label: {},
axis_x_domain_min: undefined,
axis_x_domain_max: undefined,
axis_y_show: true,
axis_y_max: undefined,
axis_y_min: undefined,
......@@ -1400,8 +1400,8 @@
};
c3_chart_internal_fn.trimXDomain = function (domain) {
var $$ = this, config = $$.config, d3 = $$.d3;
var min = d3.min([$$.orgXDomain[0], config.axis_x_domain_min]);
var max = d3.max([$$.orgXDomain[1], config.axis_x_domain_max]);
var min = d3.min([$$.orgXDomain[0], config.zoom_x_min]);
var max = d3.max([$$.orgXDomain[1], config.zoom_x_max]);
if (domain[0] <= min) {
domain[1] = +domain[1] + (min - domain[0]);
domain[0] = min;
......@@ -5512,6 +5512,37 @@
$$.redraw({withUpdateXDomain: true});
};
c3_chart_fn.zoom.max = function (max) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
if (max === 0 || max) {
config.zoom_x_max = d3.max([$$.orgXDomain[1], max]);
}
else {
return config.zoom_x_max;
}
};
c3_chart_fn.zoom.min = function (min) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
if (min === 0 || min) {
config.zoom_x_min = d3.min([$$.orgXDomain[0], min]);
}
else {
return config.zoom_x_min;
}
};
c3_chart_fn.zoom.range = function (range) {
if (arguments.length) {
if (isDefined(range.max)) { this.domain.max(range.max); }
if (isDefined(range.min)) { this.domain.min(range.min); }
} else {
return {
max: this.domain.max(),
min: this.domain.min()
};
}
};
c3_chart_fn.load = function (args) {
var $$ = this.internal, config = $$.config;
// update xs if specified
......@@ -6126,39 +6157,6 @@
}
};
c3_chart_fn.domain = function () {};
c3_chart_fn.domain.max = function (max) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
if (max === 0 || max) {
config.axis_x_domain_max = d3.max([$$.orgXDomain[1], max]);
}
else {
return config.axis_x_domain_max;
}
};
c3_chart_fn.domain.min = function (min) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
if (min === 0 || min) {
config.axis_x_domain_min = d3.min([$$.orgXDomain[0], min]);
}
else {
return config.axis_x_domain_min;
}
};
c3_chart_fn.domain.range = function (range) {
if (arguments.length) {
if (isDefined(range.max)) { this.domain.max(range.max); }
if (isDefined(range.min)) { this.domain.min(range.min); }
} else {
return {
max: this.domain.max(),
min: this.domain.min()
};
}
};
c3_chart_fn.legend = function () {};
c3_chart_fn.legend.show = function (targetIds) {
var $$ = this.internal;
......
c3.min.js
View file @ c92bbb43
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api.domain.js deleted 100644 → 0
View file @ 9eb84205
c3_chart_fn.domain = function () {};
c3_chart_fn.domain.max = function (max) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
if (max === 0 || max) {
config.axis_x_domain_max = d3.max([$$.orgXDomain[1], max]);
}
else {
return config.axis_x_domain_max;
}
};
c3_chart_fn.domain.min = function (min) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
if (min === 0 || min) {
config.axis_x_domain_min = d3.min([$$.orgXDomain[0], min]);
}
else {
return config.axis_x_domain_min;
}
};
c3_chart_fn.domain.range = function (range) {
if (arguments.length) {
if (isDefined(range.max)) { this.domain.max(range.max); }
if (isDefined(range.min)) { this.domain.min(range.min); }
} else {
return {
max: this.domain.max(),
min: this.domain.min()
};
}
};
\ No newline at end of file
src/api.zoom.js
View file @ c92bbb43
......@@ -10,3 +10,35 @@ c3_chart_fn.unzoom = function () {
$$.brush.clear().update();
$$.redraw({withUpdateXDomain: true});
};
c3_chart_fn.zoom.max = function (max) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
if (max === 0 || max) {
config.zoom_x_max = d3.max([$$.orgXDomain[1], max]);
}
else {
return config.zoom_x_max;
}
};
c3_chart_fn.zoom.min = function (min) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
if (min === 0 || min) {
config.zoom_x_min = d3.min([$$.orgXDomain[0], min]);
}
else {
return config.zoom_x_min;
}
};
c3_chart_fn.zoom.range = function (range) {
if (arguments.length) {
if (isDefined(range.max)) { this.domain.max(range.max); }
if (isDefined(range.min)) { this.domain.min(range.min); }
} else {
return {
max: this.domain.max(),
min: this.domain.min()
};
}
};
\ No newline at end of file
src/config.js
View file @ c92bbb43
......@@ -11,6 +11,8 @@ c3_chart_internal_fn.getDefaultConfig = function () {
zoom_extent: undefined,
zoom_privileged: false,
zoom_onzoom: function () {},
zoom_x_min: undefined,
zoom_x_max: undefined,
interaction_enabled: true,
onmouseover: function () {},
onmouseout: function () {},
......@@ -95,8 +97,6 @@ c3_chart_internal_fn.getDefaultConfig = function () {
axis_x_height: undefined,
axis_x_extent: undefined,
axis_x_label: {},
axis_x_domain_min: undefined,
axis_x_domain_max: undefined,
axis_y_show: true,
axis_y_max: undefined,
axis_y_min: undefined,
......
src/domain.js
View file @ c92bbb43
......@@ -214,8 +214,8 @@ c3_chart_internal_fn.updateXDomain = function (targets, withUpdateXDomain, withU
};
c3_chart_internal_fn.trimXDomain = function (domain) {
var $$ = this, config = $$.config, d3 = $$.d3;
var min = d3.min([$$.orgXDomain[0], config.axis_x_domain_min]);
var max = d3.max([$$.orgXDomain[1], config.axis_x_domain_max]);
var min = d3.min([$$.orgXDomain[0], config.zoom_x_min]);
var max = d3.max([$$.orgXDomain[1], config.zoom_x_max]);
if (domain[0] <= min) {
domain[1] = +domain[1] + (min - domain[0]);
domain[0] = min;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment