github-mirrors
/
thingsboard-flot
mirror of https://github.com/thingsboard/flot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor cleanup in axisOptions check.

Browse Source
pull/1/head
David Schnur 13 years ago
parent 80851c0dd7
commit cc1d6bf38c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File

24
jquery.flot.js
Unescape Escape View File

@ -867,11 +867,13 @@ Licensed under the MIT license.
// Compatibility with markrcote/flot-axislabels // 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); axisOptions = $.extend(true, {}, options.xaxis, axisOptions);
@ -899,11 +901,13 @@ Licensed under the MIT license.
// Compatibility with markrcote/flot-axislabels // 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); axisOptions = $.extend(true, {}, options.yaxis, axisOptions);

Write Preview
Loading…
Cancel
Save