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

Fix Issue #61

master
johnkiernander 2014-04-08 00:59:39 +01:00
parent 062500eb13
commit 3d4c7a0353
4 changed files with 89 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dist/dimple.v1.2.0.js vendored
View File

@ -3667,6 +3667,7 @@ var dimple = {
// Get self pointer for inner functions
var self = this,
sourceData = series.data || chart.data,
data = series._positionData,
fillIns = [],
uniqueValues = [],
@ -3675,6 +3676,7 @@ var dimple = {
firstAgg = 1,
graded = false,
seriesClass = "series" + chart.series.indexOf(series),
orderedSeriesArray = dimple._getOrderedList(sourceData, series.categoryFields, [].concat(series._orderRules)),
line,
markers,
markerBacks;
@ -3724,6 +3726,7 @@ var dimple = {
.append("svg:path")
.attr("opacity", function(d) { return chart.getColor(d).opacity; });
}
series.shapes
.data(uniqueValues)
.transition().duration(duration)
@ -3741,11 +3744,36 @@ var dimple = {
}
}, this);
seriesData.sort(function (a, b) {
var sortValue = 0;
var sortValue = 0,
p,
q,
aMatch,
bMatch;
if (series.x._hasCategories()) {
sortValue = (dimple._helpers.cx(a, chart, series) < dimple._helpers.cx(b, chart, series) ? -1 : 1);
} else if (series.y._hasCategories()) {
sortValue = (dimple._helpers.cy(a, chart, series) < dimple._helpers.cy(b, chart, series) ? -1 : 1);
} else if (orderedSeriesArray !== null && orderedSeriesArray !== undefined) {
for (p = 0; p < orderedSeriesArray.length; p += 1) {
aMatch = true;
bMatch = true;
for (q = 0; q < a.aggField.length; q += 1) {
aMatch = aMatch && (a.aggField[q] === orderedSeriesArray[p][q]);
}
for (q = 0; q < b.aggField.length; q += 1) {
bMatch = bMatch && (b.aggField[q] === orderedSeriesArray[p][q]);
}
if (aMatch && bMatch) {
sortValue = 0;
break;
} else if (aMatch) {
sortValue = -1;
break;
} else if (bMatch) {
sortValue = 1;
break;
}
}
}
return sortValue;
});

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

File diff suppressed because one or more lines are too long

30
src/objects/plot/line.js
View File

@ -8,6 +8,7 @@
// Get self pointer for inner functions
var self = this,
sourceData = series.data || chart.data,
data = series._positionData,
fillIns = [],
uniqueValues = [],
@ -16,6 +17,7 @@
firstAgg = 1,
graded = false,
seriesClass = "series" + chart.series.indexOf(series),
orderedSeriesArray = dimple._getOrderedList(sourceData, series.categoryFields, [].concat(series._orderRules)),
line,
markers,
markerBacks;
@ -65,6 +67,7 @@
.append("svg:path")
.attr("opacity", function(d) { return chart.getColor(d).opacity; });
}
series.shapes
.data(uniqueValues)
.transition().duration(duration)
@ -82,11 +85,36 @@
}
}, this);
seriesData.sort(function (a, b) {
var sortValue = 0;
var sortValue = 0,
p,
q,
aMatch,
bMatch;
if (series.x._hasCategories()) {
sortValue = (dimple._helpers.cx(a, chart, series) < dimple._helpers.cx(b, chart, series) ? -1 : 1);
} else if (series.y._hasCategories()) {
sortValue = (dimple._helpers.cy(a, chart, series) < dimple._helpers.cy(b, chart, series) ? -1 : 1);
} else if (orderedSeriesArray !== null && orderedSeriesArray !== undefined) {
for (p = 0; p < orderedSeriesArray.length; p += 1) {
aMatch = true;
bMatch = true;
for (q = 0; q < a.aggField.length; q += 1) {
aMatch = aMatch && (a.aggField[q] === orderedSeriesArray[p][q]);
}
for (q = 0; q < b.aggField.length; q += 1) {
bMatch = bMatch && (b.aggField[q] === orderedSeriesArray[p][q]);
}
if (aMatch && bMatch) {
sortValue = 0;
break;
} else if (aMatch) {
sortValue = -1;
break;
} else if (bMatch) {
sortValue = 1;
break;
}
}
}
return sortValue;
});

30
tmp/dimple.js
View File

@ -3667,6 +3667,7 @@ var dimple = {
// Get self pointer for inner functions
var self = this,
sourceData = series.data || chart.data,
data = series._positionData,
fillIns = [],
uniqueValues = [],
@ -3675,6 +3676,7 @@ var dimple = {
firstAgg = 1,
graded = false,
seriesClass = "series" + chart.series.indexOf(series),
orderedSeriesArray = dimple._getOrderedList(sourceData, series.categoryFields, [].concat(series._orderRules)),
line,
markers,
markerBacks;
@ -3724,6 +3726,7 @@ var dimple = {
.append("svg:path")
.attr("opacity", function(d) { return chart.getColor(d).opacity; });
}
series.shapes
.data(uniqueValues)
.transition().duration(duration)
@ -3741,11 +3744,36 @@ var dimple = {
}
}, this);
seriesData.sort(function (a, b) {
var sortValue = 0;
var sortValue = 0,
p,
q,
aMatch,
bMatch;
if (series.x._hasCategories()) {
sortValue = (dimple._helpers.cx(a, chart, series) < dimple._helpers.cx(b, chart, series) ? -1 : 1);
} else if (series.y._hasCategories()) {
sortValue = (dimple._helpers.cy(a, chart, series) < dimple._helpers.cy(b, chart, series) ? -1 : 1);
} else if (orderedSeriesArray !== null && orderedSeriesArray !== undefined) {
for (p = 0; p < orderedSeriesArray.length; p += 1) {
aMatch = true;
bMatch = true;
for (q = 0; q < a.aggField.length; q += 1) {
aMatch = aMatch && (a.aggField[q] === orderedSeriesArray[p][q]);
}
for (q = 0; q < b.aggField.length; q += 1) {
bMatch = bMatch && (b.aggField[q] === orderedSeriesArray[p][q]);
}
if (aMatch && bMatch) {
sortValue = 0;
break;
} else if (aMatch) {
sortValue = -1;
break;
} else if (bMatch) {
sortValue = 1;
break;
}
}
}
return sortValue;
});