From 5e3ba78f6ff1c47e679ee9a2bd5594b416885a3a Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 13 Aug 2013 17:53:24 -0500 Subject: [PATCH] Handle undefined axisOptions I ran into this issue when upgrading from 0.8.1 to 0.9-work. --- jquery.flot.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jquery.flot.js b/jquery.flot.js index e5c4102..03ede5d 100644 --- a/jquery.flot.js +++ b/jquery.flot.js @@ -867,10 +867,10 @@ Licensed under the MIT license. // Compatibility with markrcote/flot-axislabels - if (!axisOptions.label && axisOptions.axisLabel) { + if (axisOptions && !axisOptions.label && axisOptions.axisLabel) { axisOptions.label = axisOptions.axisLabel; } - if (!axisOptions.labelPadding && axisOptions.axisLabelPadding) { + if (axisOptions && !axisOptions.labelPadding && axisOptions.axisLabelPadding) { axisOptions.labelPadding = axisOptions.axisLabelPadding; } @@ -899,10 +899,10 @@ Licensed under the MIT license. // Compatibility with markrcote/flot-axislabels - if (!axisOptions.label && axisOptions.axisLabel) { + if (axisOptions && !axisOptions.label && axisOptions.axisLabel) { axisOptions.label = axisOptions.axisLabel; } - if (!axisOptions.labelPadding && axisOptions.axisLabelPadding) { + if (axisOptions && !axisOptions.labelPadding && axisOptions.axisLabelPadding) { axisOptions.labelPadding = axisOptions.axisLabelPadding; }