Commit de247e02 authored by olau@iola.dk's avatar olau@iola.dk

Fixed a couple of minor issues and bumped version no.

git-svn-id: https://flot.googlecode.com/svn/trunk@93 1e0a6537-2640-0410-bfb7-f154510ff394
parent 04a35ed0
Flot x.x Flot 0.5
-------- --------
Backwards API change summary: Timestamps are now in UTC. Also Backwards API change summary: Timestamps are now in UTC. Also
......
...@@ -11,7 +11,6 @@ grid configuration ...@@ -11,7 +11,6 @@ grid configuration
selection selection
- user should be able to cancel selection with escape - user should be able to cancel selection with escape
- select points
interactive zooming interactive zooming
- convenience zoom(x1, y1, x2, y2)? and zoomOut() (via zoom stack)? - convenience zoom(x1, y1, x2, y2)? and zoomOut() (via zoom stack)?
......
/* Javascript plotting library for jQuery, v. 0.4. /* Javascript plotting library for jQuery, v. 0.5.
* *
* Released under the MIT license by iola, December 2007. * Released under the MIT license by IOLA, December 2007.
* *
*/ */
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
// make sure we got room for the bar // make sure we got room for the bar
if (series[i].bars.show) { if (series[i].bars.show) {
var mindelta = series[i].bars.align == "left" ? 0 : -series[i].bars.barWidth/2; mindelta = series[i].bars.align == "left" ? 0 : -series[i].bars.barWidth/2;
maxdelta = mindelta + series[i].bars.barWidth; maxdelta = mindelta + series[i].bars.barWidth;
} }
...@@ -953,7 +953,7 @@ ...@@ -953,7 +953,7 @@
ctx.lineTo(plotWidth, Math.floor(axis.p2c(v)) + ctx.lineWidth/2); ctx.lineTo(plotWidth, Math.floor(axis.p2c(v)) + ctx.lineWidth/2);
} }
axis = axes.x2axis axis = axes.x2axis;
for (i = 0; i < axis.ticks.length; ++i) { for (i = 0; i < axis.ticks.length; ++i) {
v = axis.ticks[i].v; v = axis.ticks[i].v;
if (v <= axis.min || v >= axis.max) if (v <= axis.min || v >= axis.max)
...@@ -1346,7 +1346,7 @@ ...@@ -1346,7 +1346,7 @@
// account for negative bars // account for negative bars
if (top < bottom) { if (top < bottom) {
top = 0; top = 0;
bottom = y bottom = y;
drawBottom = true; drawBottom = true;
drawTop = false; drawTop = false;
} }
...@@ -1557,7 +1557,7 @@ ...@@ -1557,7 +1557,7 @@
return { datapoint: series[i].data[j], return { datapoint: series[i].data[j],
dataIndex: j, dataIndex: j,
series: series[i], series: series[i],
seriesIndex: i } seriesIndex: i };
} }
for (var i = 0; i < series.length; ++i) { for (var i = 0; i < series.length; ++i) {
...@@ -1728,14 +1728,14 @@ ...@@ -1728,14 +1728,14 @@
octx.clearRect(0, 0, canvasWidth, canvasHeight); octx.clearRect(0, 0, canvasWidth, canvasHeight);
octx.translate(plotOffset.left, plotOffset.top); octx.translate(plotOffset.left, plotOffset.top);
var i, h; var i, hi;
for (i = 0; i < highlights.length; ++i) { for (i = 0; i < highlights.length; ++i) {
h = highlights[i]; hi = highlights[i];
if (h.series.bars.show) if (hi.series.bars.show)
drawBarHighlight(h.series, h.point); drawBarHighlight(hi.series, hi.point);
else else
drawPointHighlight(h.series, h.point); drawPointHighlight(hi.series, hi.point);
} }
octx.restore(); octx.restore();
......
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