Skip to content

F
flot
Commit 5e3ba78f authored by Trask Stalnaker's avatar Trask Stalnaker
Browse files
Options

Handle undefined axisOptions 

I ran into this issue when upgrading from 0.8.1 to 0.9-work.
parent 4318eeae
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
jquery.flot.js
View file @ 5e3ba78f
...@@ -867,10 +867,10 @@ Licensed under the MIT license. ...@@ -867,10 +867,10 @@ Licensed under the MIT license.
// Compatibility with markrcote/flot-axislabels // Compatibility with markrcote/flot-axislabels
if (!axisOptions.label && axisOptions.axisLabel) { if (axisOptions && !axisOptions.label && axisOptions.axisLabel) {
axisOptions.label = axisOptions.axisLabel; axisOptions.label = axisOptions.axisLabel;
} }
if (!axisOptions.labelPadding && axisOptions.axisLabelPadding) { if (axisOptions && !axisOptions.labelPadding && axisOptions.axisLabelPadding) {
axisOptions.labelPadding = axisOptions.axisLabelPadding; axisOptions.labelPadding = axisOptions.axisLabelPadding;
} }
...@@ -899,10 +899,10 @@ Licensed under the MIT license. ...@@ -899,10 +899,10 @@ Licensed under the MIT license.
// Compatibility with markrcote/flot-axislabels // Compatibility with markrcote/flot-axislabels
if (!axisOptions.label && axisOptions.axisLabel) { if (axisOptions && !axisOptions.label && axisOptions.axisLabel) {
axisOptions.label = axisOptions.axisLabel; axisOptions.label = axisOptions.axisLabel;
} }
if (!axisOptions.labelPadding && axisOptions.axisLabelPadding) { if (axisOptions && !axisOptions.labelPadding && axisOptions.axisLabelPadding) {
axisOptions.labelPadding = axisOptions.axisLabelPadding; axisOptions.labelPadding = axisOptions.axisLabelPadding;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment