Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch for colors array, issue #1031 #1034

Merged
merged 2 commits into from
Apr 28, 2013
Merged

Commits on Apr 24, 2013

  1. Override colors array after extend in parseOptions

    (Realted to flot issue flot#1031: flot#1031)
    
    Currently, if the user declares a custom color palette with less than 5 colors (say, n), $.extend(true, options, opts) only modifies the first n colors of the default palette and leaves the last 5-n in place. When the number of series is >n, colors are used that are not part of user-defined palette, contrary to description of colors array in API.
    
    This line overrides the extended colors array and replaces it with exactly the user-defined colors array, when present. Afterwards, the user color palette is respected by the auto tinting/shading system for when there are more series than colors.
    BrendanFDMoore committed Apr 24, 2013
    Configuration menu
    Copy the full SHA
    fccc8a6 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2013

  1. Add comment and desired structure to colors patch

    Per request from dnschnur (flot#1034 (comment)), I have: 
    - Added a comment explaining the purpose of the new check/override
    - Changed the structure to match preferred standard structure
    BrendanFDMoore committed Apr 28, 2013
    Configuration menu
    Copy the full SHA
    c20370a View commit details
    Browse the repository at this point in the history