From de247e02873a5b5af254760c8d78622784131155 Mon Sep 17 00:00:00 2001
From: "olau@iola.dk" <olau@iola.dk@1e0a6537-2640-0410-bfb7-f154510ff394>
Date: Thu, 25 Sep 2008 10:11:03 +0000
Subject: [PATCH] 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
---
 NEWS.txt       |  2 +-
 TODO           |  1 -
 jquery.flot.js | 22 +++++++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/NEWS.txt b/NEWS.txt
index 22d9174..49bf82b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,4 +1,4 @@
-Flot x.x
+Flot 0.5
 --------
 
 Backwards API change summary: Timestamps are now in UTC. Also
diff --git a/TODO b/TODO
index 49bb53c..3f7be1c 100644
--- a/TODO
+++ b/TODO
@@ -11,7 +11,6 @@ grid configuration
 
 selection
   - user should be able to cancel selection with escape
-  - select points
 
 interactive zooming
   - convenience zoom(x1, y1, x2, y2)? and zoomOut() (via zoom stack)?
diff --git a/jquery.flot.js b/jquery.flot.js
index 4e513ef..b1b298e 100644
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -1,6 +1,6 @@
-/* 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 @@
                 
                 // make sure we got room for the bar
                 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;
                 }
                 
@@ -953,7 +953,7 @@
                 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) {
                 v = axis.ticks[i].v;
                 if (v <= axis.min || v >= axis.max)
@@ -1346,7 +1346,7 @@
             // account for negative bars
             if (top < bottom) {
                 top = 0;
-                bottom = y
+                bottom = y;
                 drawBottom = true;
                 drawTop = false;
             }
@@ -1557,7 +1557,7 @@
                 return { datapoint: series[i].data[j],
                          dataIndex: j,
                          series: series[i],
-                         seriesIndex: i }
+                         seriesIndex: i };
             }
             
             for (var i = 0; i < series.length; ++i) {
@@ -1728,14 +1728,14 @@
             octx.clearRect(0, 0, canvasWidth, canvasHeight);
             octx.translate(plotOffset.left, plotOffset.top);
             
-            var i, h; 
+            var i, hi; 
             for (i = 0; i < highlights.length; ++i) {
-                h = highlights[i];
+                hi = highlights[i];
 
-                if (h.series.bars.show)
-                    drawBarHighlight(h.series, h.point);
+                if (hi.series.bars.show)
+                    drawBarHighlight(hi.series, hi.point);
                 else
-                    drawPointHighlight(h.series, h.point);
+                    drawPointHighlight(hi.series, hi.point);
             }
             octx.restore();