Fixed a bug with setData(getData()) and secondary axes

git-svn-id: https://flot.googlecode.com/svn/trunk@98 1e0a6537-2640-0410-bfb7-f154510ff394
18 years ago · eb45adb2bb
parent 72ad98a30f
commit eb45adb2bb
1 changed files with 14 additions and 6 deletions
--- a/jquery.flot.js
+++ b/jquery.flot.js
@ -234,14 +234,22 @@
                s.bars = $.extend(true, {}, options.bars, s.bars);
                if (s.shadowSize == null)
                    s.shadowSize = options.shadowSize;
-                if (s.xaxis && s.xaxis == 2)
-                    s.xaxis = axes.x2axis;
-                else
+
+                if (!s.xaxis)
                    s.xaxis = axes.xaxis;
-                if (s.yaxis && s.yaxis == 2)
-                    s.yaxis = axes.y2axis;
-                else
+
+                if (s.xaxis == 1)
+                    s.xaxis = axes.xaxis;
+                else if (s.xaxis == 2)
+                    s.xaxis = axes.x2axis;
+
+                if (!s.yaxis)
                    s.yaxis = axes.yaxis;
+
+                if (s.yaxis == 1)
+                    s.yaxis = axes.yaxis;
+                else if (s.yaxis == 2)
+                    s.yaxis = axes.y2axis;
            }
        }