From 29a4803e4b3d5fe4ecd7af947843a0444c198639 Mon Sep 17 00:00:00 2001
From: Thaddee Tyl <thaddee.tyl@gmail.com>
Date: Sun, 30 Oct 2016 15:30:47 +0100
Subject: [PATCH] Support combining colorA and colorscheme

---
 badge.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/badge.js b/badge.js
index cdc5da2..fbf039c 100644
--- a/badge.js
+++ b/badge.js
@@ -39,6 +39,8 @@ function optimize(string, callback) {
   svgo.optimize(string, callback);
 }
 
+var cssColor = /^#([0-9a-fA-F]{6}|[0-9a-fA-F]{3})$/;
+
 function makeImage(data, cb) {
   if (data.format !== 'json') {
     data.format = 'svg';
@@ -51,9 +53,12 @@ function makeImage(data, cb) {
     if (!pickedColorscheme) {
       pickedColorscheme = colorscheme.red;
     }
-    data.colorA = pickedColorscheme.colorA;
-    data.colorB = pickedColorscheme.colorB;
+    data.colorA = pickedColorscheme.colorA || data.colorA;
+    data.colorB = pickedColorscheme.colorB || data.colorB;
   }
+  // Colors.
+  if (!cssColor.test(data.colorA)) { data.colorA = undefined; }
+  if (!cssColor.test(data.colorB)) { data.colorB = undefined; }
   // Logo.
   data.logoWidth = +data.logoWidth || (data.logo? 14: 0);
   data.logoPadding = (data.logo? 3: 0);