Fix bug with using aboveData with a background (reported by amitayd)

git-svn-id: https://flot.googlecode.com/svn/trunk@283 1e0a6537-2640-0410-bfb7-f154510ff394

NEWS.txt

@@ -111,6 +111,8 @@ Bug fixes:
 - Listen for mouseleave events and fire a plothover event with empty
   item when it occurs to drop highlights when the mouse leaves the
   plot (reported by by outspirit).
+- Fix bug with using aboveData with a background (reported by amitayd).
+
 
 Flot 0.6
 --------

jquery.flot.js

@@ -1364,6 +1364,10 @@
 
             var grid = options.grid;
 
+            // draw background, if any
+            if (grid.show && grid.backgroundColor)
+                drawBackground();
+            
             if (grid.show && !grid.aboveData)
                 drawGrid();
 
@@ -1413,18 +1417,21 @@
             return { from: from, to: to, axis: axis };
         }
         
-        function drawGrid() {
-            var i;
-            
+        function drawBackground() {
             ctx.save();
             ctx.translate(plotOffset.left, plotOffset.top);
 
-            // draw background, if any
-            if (options.grid.backgroundColor) {
             ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
             ctx.fillRect(0, 0, plotWidth, plotHeight);
+            ctx.restore();
         }
 
+        function drawGrid() {
+            var i;
+            
+            ctx.save();
+            ctx.translate(plotOffset.left, plotOffset.top);
+
             // draw markings
             var markings = options.grid.markings;
             if (markings) {