Merge pull request #929 from hizhengfu/master

Fix an error in plot offset calculation.
13 years ago · 36bfcbf08a
parent f06fe931ea 3c1d04cbd1
commit 36bfcbf08a
1 changed files with 2 additions and 2 deletions
--- a/jquery.flot.js
+++ b/jquery.flot.js
@ -1142,10 +1142,10 @@ Licensed under the MIT license.

            for (var a in plotOffset) {
                if(typeof(options.grid.borderWidth) == "object") {
-                    plotOffset[a] = showGrid ? options.grid.borderWidth[a] : 0;
+                    plotOffset[a] += showGrid ? options.grid.borderWidth[a] : 0;
                }
                else {
-                    plotOffset[a] = showGrid ? options.grid.borderWidth : 0;
+                    plotOffset[a] += showGrid ? options.grid.borderWidth : 0;
                }
            }