Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
F
flot
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HS-public
flot
Commits
7c6993e7
Commit
7c6993e7
authored
Apr 28, 2013
by
David Schnur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a regression when no options are provided.
parent
f1248155
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
jquery.flot.js
jquery.flot.js
+7
-4
No files found.
jquery.flot.js
View file @
7c6993e7
...
...
@@ -642,9 +642,12 @@ Licensed under the MIT license.
$
.
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
)
{
// $.extend merges arrays, rather than replacing them. When less
// colors are provided than the size of the default palette, we
// end up with those colors plus the remaining defaults, which is
// not expected behavior; avoid it by replacing them here.
if
(
opts
&&
opts
.
colors
)
{
options
.
colors
=
opts
.
colors
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment