[#324] Show full labels on flot bar y-axis

This commit is contained in:
John Glover
2013-02-20 12:15:43 +00:00
parent c8523d80f2
commit aaef39c724

View File

@@ -191,7 +191,7 @@ my.Flot = Backbone.View.extend({
if (typeof label !== 'string') { if (typeof label !== 'string') {
label = label.toString(); label = label.toString();
} }
if (label.length > 8) { if (self.state.attributes.graphType !== 'bars' && label.length > 8) {
label = label.slice(0, 5) + "..."; label = label.slice(0, 5) + "...";
} }
@@ -211,12 +211,16 @@ my.Flot = Backbone.View.extend({
x = 1, x = 1,
i = 0; i = 0;
// show all ticks in bar graphs
// for other graphs only show up to maxTicks ticks
if (self.state.attributes.graphType !== 'bars') {
while (x <= maxTicks) { while (x <= maxTicks) {
if ((numPoints / x) <= maxTicks) { if ((numPoints / x) <= maxTicks) {
break; break;
} }
x = x + 1; x = x + 1;
} }
}
for (i = 0; i < numPoints; i = i + x) { for (i = 0; i < numPoints; i = i + x) {
ticks.push(i); ticks.push(i);