Take the grid background color into account when auto-detecting the legend background

git-svn-id: https://flot.googlecode.com/svn/trunk@11 1e0a6537-2640-0410-bfb7-f154510ff394
19 years ago · 8309363a62
parent da0726b168
commit 8309363a62
1 changed files with 8 additions and 2 deletions
--- a/jquery.flot.js
+++ b/jquery.flot.js
@ -977,8 +977,14 @@
                        // separately to avoid blended labels and
                        // label boxes
                        var c = options.legend.backgroundColor;
-                        if (c == null)
-                            c = parseColor(extractColor(div)).adjust(null, null, null, 1).toString();
+                        if (c == null) {
+                            var tmp;
+                            if (options.grid.backgroundColor != null)
+                                tmp = options.grid.backgroundColor;
+                            else
+                                tmp = extractColor(div);
+                            c = parseColor(tmp).adjust(null, null, null, 1).toString();
+                        }
                        $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').appendTo(target).css('opacity', options.legend.backgroundOpacity);
                        
                    }