vitalif-js
/
dimple
mirror of https://github.com/vitalif/dimple
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix superfluous periods on time axis

master
John Kiernander 2013-07-12 17:42:38 +01:00
parent 2cc17515dc
commit dfb83a3f0c
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dist/dimple.v1.js vendored
View File

@ -317,7 +317,7 @@ var dimple = {
.domain([this._min, this._max]);
}
// Check that the axis ends on a labelled tick
if ((refactor === null || refactor === undefined || refactor === false) && this._scale !== null && this._scale.ticks !== null && this._scale.ticks !== undefined && this._scale.ticks(10).length > 0 && (this.position === "x" || this.position === "y")) {
if ((refactor === null || refactor === undefined || refactor === false) && !this._hasTimeField() && this._scale !== null && this._scale.ticks !== null && this._scale.ticks !== undefined && this._scale.ticks(10).length > 0 && (this.position === "x" || this.position === "y")) {
// Get the ticks determined based on a split of 10
ticks = this._scale.ticks(10);
@ -2063,6 +2063,10 @@ var dimple = {
catPoints = {},
markers;
if (chart._tooltipGroup !== null && chart._tooltipGroup !== undefined) {
chart._tooltipGroup.remove();
}
// If there is a category axis we should draw a line for each aggField. Otherwise
// the first aggField defines the points and the others define the line
if (series.x._hasCategories() || series.y._hasCategories()) {
@ -2458,12 +2462,9 @@ var dimple = {
theseShapes = null,
className = "series" + chart.series.indexOf(series);
// Clear any hover gubbins before redrawing so the hover markers aren't left behind
chart._group.selectAll(".hoverShapes")
.transition()
.duration(duration / 4)
.style("opacity", 0)
.remove();
if (chart._tooltipGroup !== null && chart._tooltipGroup !== undefined) {
chart._tooltipGroup.remove();
}
if (series.shapes === null || series.shapes === undefined) {
theseShapes = chart._group.selectAll("." + className).data(chartData);
@ -2750,12 +2751,9 @@ var dimple = {
theseShapes = null,
className = "series" + chart.series.indexOf(series);
// Clear any hover gubbins before redrawing so the hover markers aren't left behind
chart._group.selectAll(".hoverShapes")
.transition()
.duration(duration / 4)
.style("opacity", 0)
.remove();
if (chart._tooltipGroup !== null && chart._tooltipGroup !== undefined) {
chart._tooltipGroup.remove();
}
if (series.shapes === null || series.shapes === undefined) {
theseShapes = chart._group.selectAll("." + className).data(chartData);
@ -3040,6 +3038,10 @@ var dimple = {
line,
markers;
if (chart._tooltipGroup !== null && chart._tooltipGroup !== undefined) {
chart._tooltipGroup.remove();
}
if (series.x._hasCategories() || series.y._hasCategories()) {
firstAgg = 0;
}

4
dist/dimple.v1.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/objects/axis/methods/_update.js
View File

@ -120,7 +120,7 @@
.domain([this._min, this._max]);
}
// Check that the axis ends on a labelled tick
if ((refactor === null || refactor === undefined || refactor === false) && this._scale !== null && this._scale.ticks !== null && this._scale.ticks !== undefined && this._scale.ticks(10).length > 0 && (this.position === "x" || this.position === "y")) {
if ((refactor === null || refactor === undefined || refactor === false) && !this._hasTimeField() && this._scale !== null && this._scale.ticks !== null && this._scale.ticks !== undefined && this._scale.ticks(10).length > 0 && (this.position === "x" || this.position === "y")) {
// Get the ticks determined based on a split of 10
ticks = this._scale.ticks(10);