Patch for colors array, issue #1031

[BrendanFDMoore]

(Related to flot issue #1031: #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.

(If I've done this Pull Request thing wrong, I apologize. This is my first time, so let me know what I should have done instead, please.)

Edit: New commit to address dnschnur requests.

[dnschnur]

I think you've got exactly the right idea here; just two comments:

1. Add a comment above your change, explaining its purpose, since the problem is a little subtle.
2. Use braces even for a single-line statement, like this:

if (...) {
    ...
}

The codebase currently omits braces in many cases, but we're trying to move to a consistent standard, and I'd like all new contributions to follow that. Push those changes and I'll merge this right away. Thanks again for finding this, and for your patch!

[BrendanFDMoore]

I've made the changes requested and the commit appears to have been added to this Pull Request automatically.

Let me know if you'd like any other changes. Glad to help!

[dnschnur]

Thanks!