Minor cleanup in axisOptions check.

cc1d6bf3 · David Schnur · 80851c0d · cc1d6bf3
Commit cc1d6bf3 authored Oct 14, 2013 by David Schnur
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 10 deletions

jquery.flot.js jquery.flot.js +14 -10

No files found.
--- 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) {
+                if (axisOptions) {
-                    axisOptions.label = axisOptions.axisLabel;
+                    if (!axisOptions.label && axisOptions.axisLabel) {
-                }
+                        axisOptions.label = axisOptions.axisLabel;
-                if (axisOptions && !axisOptions.labelPadding && axisOptions.axisLabelPadding) {
+                    }
-                    axisOptions.labelPadding = axisOptions.axisLabelPadding;
+                    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) {
+                if (axisOptions) {
-                    axisOptions.label = axisOptions.axisLabel;
+                    if (!axisOptions.label && axisOptions.axisLabel) {
-                }
+                        axisOptions.label = axisOptions.axisLabel;
-                if (axisOptions && !axisOptions.labelPadding && axisOptions.axisLabelPadding) {
+                    }
-                    axisOptions.labelPadding = axisOptions.axisLabelPadding;
+                    if (!axisOptions.labelPadding && axisOptions.axisLabelPadding) {
+                        axisOptions.labelPadding = axisOptions.axisLabelPadding;
+                    }
                }
                axisOptions = $.extend(true, {}, options.yaxis, axisOptions);