From c20370ab57327100daf09828dd0a9e811b026cac Mon Sep 17 00:00:00 2001
From: goorpy <github@goorpy.com>
Date: Sun, 28 Apr 2013 04:43:13 -0300
Subject: [PATCH] Add comment and desired structure to colors patch

Per request from dnschnur (https://github.com/flot/flot/pull/1034#issuecomment-17119203), I have:
- Added a comment explaining the purpose of the new check/override
- Changed the structure to match preferred standard structure
---
 jquery.flot.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jquery.flot.js b/jquery.flot.js
index d739bdf..447714a 100644
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -642,7 +642,11 @@ Licensed under the MIT license.
 
             $.extend(true, options, opts);
             
-            if (opts.colors) options.colors = opts.colors;
+            //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)
                 options.xaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();