Commit 2bb9c579 authored by olau@iola.dk's avatar olau@iola.dk

Fix bug in backwards-compatibility code for dual axes (reported by mystic414)


git-svn-id: https://flot.googlecode.com/svn/trunk@295 1e0a6537-2640-0410-bfb7-f154510ff394
parent 70e36134
...@@ -262,14 +262,12 @@ ...@@ -262,14 +262,12 @@
if (options.yaxis.noTicks && options.yaxis.ticks == null) if (options.yaxis.noTicks && options.yaxis.ticks == null)
options.yaxis.ticks = options.yaxis.noTicks; options.yaxis.ticks = options.yaxis.noTicks;
if (options.x2axis) { if (options.x2axis) {
options.x2axis.position = "top"; options.xaxes[1] = $.extend(true, options.x2axis, options.xaxis);
options.xaxes[1] = options.x2axis; options.xaxes[1].position = "top";
} }
if (options.y2axis) { if (options.y2axis) {
if (options.y2axis.autoscaleMargin === undefined) options.yaxes[1] = $.extend(true, options.y2axis, options.yaxis);
options.y2axis.autoscaleMargin = 0.02; options.yaxes[1].position = "right";
options.y2axis.position = "right";
options.yaxes[1] = options.y2axis;
} }
if (options.grid.coloredAreas) if (options.grid.coloredAreas)
options.grid.markings = options.grid.coloredAreas; options.grid.markings = options.grid.coloredAreas;
......
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