From 797697b7f1ce763ab2676d634b1f6f787ae727c3 Mon Sep 17 00:00:00 2001
From: "olau@iola.dk" <olau@iola.dk@1e0a6537-2640-0410-bfb7-f154510ff394>
Date: Tue, 1 Sep 2009 14:39:18 +0000
Subject: [PATCH] Fixed a bug with respecting min/max on partially invalid
 points, added some missing semicolons

git-svn-id: https://flot.googlecode.com/svn/trunk@199 1e0a6537-2640-0410-bfb7-f154510ff394
---
 jquery.flot.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/jquery.flot.js b/jquery.flot.js
index 7d94cb1..48d510c 100644
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -359,8 +359,8 @@
                 if (!format) {
                     format = []
                     // find out how to copy
-                    format.push({ x: true, number: true, required: true })
-                    format.push({ y: true, number: true, required: true })
+                    format.push({ x: true, number: true, required: true });
+                    format.push({ y: true, number: true, required: true });
 
                     if (s.bars.show)
                         format.push({ y: true, number: true, required: false, defaultValue: 0 });
@@ -397,15 +397,8 @@
                                 }
 
                                 if (val == null) {
-                                    if (f.required) {
-                                        // extract min/max info before we whack it
-                                        if (f.x)
-                                            updateAxis(s.xaxis, val, val)
-                                        if (f.y)
-                                            updateAxis(s.yaxis, val, val)
-                                        val = null;
+                                    if (f.required)
                                         nullify = true;
-                                    }
                                     
                                     if (f.defaultValue != null)
                                         val = f.defaultValue;
@@ -417,8 +410,18 @@
                     }
                     
                     if (nullify) {
-                        for (m = 0; m < ps; ++m)
+                        for (m = 0; m < ps; ++m) {
+                            val = points[k + m];
+                            if (val != null) {
+                                f = format[m];
+                                // extract min/max info
+                                if (f.x)
+                                    updateAxis(s.xaxis, val, val);
+                                if (f.y)
+                                    updateAxis(s.yaxis, val, val);
+                            }
                             points[k + m] = null;
+                        }
                     }
                     else {
                         // a little bit of line specific stuff that
@@ -442,6 +445,7 @@
                 }
             }
 
+            // give the hooks a chance to run
             for (i = 0; i < series.length; ++i) {
                 s = series[i];