Skip to content

F
flot
Commit 80851c0d authored by David Schnur's avatar David Schnur
Browse files
Options

Merge pull request #1107 from trask/undefined-axis-options-fix 

Handle undefined axisOptions in 0.9-work
parents 5ae2236c 5e3ba78f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
jquery.flot.js
View file @ 80851c0d
...@@ -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