From cc1d6bf38c73fc0581ba70a465d3dab560aa3696 Mon Sep 17 00:00:00 2001
From: David Schnur <dnschnur@gmail.com>
Date: Mon, 14 Oct 2013 07:05:05 -0700
Subject: [PATCH] Minor cleanup in axisOptions check.

---
 jquery.flot.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/jquery.flot.js b/jquery.flot.js
index e74317d..40de38a 100644
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -867,11 +867,13 @@ Licensed under the MIT license.
 
                 // Compatibility with markrcote/flot-axislabels
 
-                if (axisOptions && !axisOptions.label && axisOptions.axisLabel) {
-                    axisOptions.label = axisOptions.axisLabel;
-                }
-                if (axisOptions && !axisOptions.labelPadding && axisOptions.axisLabelPadding) {
-                    axisOptions.labelPadding = axisOptions.axisLabelPadding;
+                if (axisOptions) {
+                    if (!axisOptions.label && axisOptions.axisLabel) {
+                        axisOptions.label = axisOptions.axisLabel;
+                    }
+                    if (!axisOptions.labelPadding && axisOptions.axisLabelPadding) {
+                        axisOptions.labelPadding = axisOptions.axisLabelPadding;
+                    }
                 }
 
                 axisOptions = $.extend(true, {}, options.xaxis, axisOptions);
@@ -899,11 +901,13 @@ Licensed under the MIT license.
 
                 // Compatibility with markrcote/flot-axislabels
 
-                if (axisOptions && !axisOptions.label && axisOptions.axisLabel) {
-                    axisOptions.label = axisOptions.axisLabel;
-                }
-                if (axisOptions && !axisOptions.labelPadding && axisOptions.axisLabelPadding) {
-                    axisOptions.labelPadding = axisOptions.axisLabelPadding;
+                if (axisOptions) {
+                    if (!axisOptions.label && axisOptions.axisLabel) {
+                        axisOptions.label = axisOptions.axisLabel;
+                    }
+                    if (!axisOptions.labelPadding && axisOptions.axisLabelPadding) {
+                        axisOptions.labelPadding = axisOptions.axisLabelPadding;
+                    }
                 }
 
                 axisOptions = $.extend(true, {}, options.yaxis, axisOptions);