Skip to content

F
flot
Commit 355b8550 authored by David Schnur's avatar David Schnur
Browse files
Options

Merge pull request #1034 from goorpy/master 

Patch for colors array, issue #1031
parents 33565aa5 c20370ab
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
jquery.flot.js
View file @ 355b8550
...@@ -642,6 +642,12 @@ Licensed under the MIT license. ...@@ -642,6 +642,12 @@ Licensed under the MIT license.
$.extend(true, options, opts); $.extend(true, options, opts);
//Override options.colors after $.extend if user has set colors, because extend does not clear out excess
//default colors if user defines color palette smaller than default palette size (currently 5).
if (opts.colors) {
options.colors = opts.colors;
}
if (options.xaxis.color == null) if (options.xaxis.color == null)
options.xaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString(); options.xaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();
if (options.yaxis.color == null) if (options.yaxis.color == null)
......
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