Merge pull request #929 from hizhengfu/master

Fix an error in plot offset calculation.

Merge pull request #929 from hizhengfu/master
Fix an error in plot offset calculation.
36bfcbf0 · David Schnur · f06fe931 · 3c1d04cb · 36bfcbf0
Commit 36bfcbf0 authored Jan 14, 2013 by David Schnur
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

jquery.flot.js jquery.flot.js +2 -2

No files found.
--- 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;
                }
            }