Fix to make_color with a base_color

Fooidge · Sep 16, 2014 · f86f673 · f86f673
1 parent 38dd830
commit f86f673
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pleasejs",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "homepage": "https://github.com/Fooidge/PleaseJS",
   "authors": [
     "Fooidge"

diff --git a/dist/Please.js b/dist/Please.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pleasejs",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "JS library to generate random pleasing colors/color schemes",
   "main": "Please.js",
   "scripts": {

diff --git a/src/Please.js b/src/Please.js
@@ -1,4 +1,4 @@
-/*!Please JS v0.2.5, Jordan Checkman 2014, Checkman.io, MIT License, Have fun.*/
+/*!Please JS v0.2.6, Jordan Checkman 2014, Checkman.io, MIT License, Have fun.*/
 (function( globalName, root, factory ) {
 	if ( typeof define === 'function' && define.amd ) {
 		define( [], factory );
@@ -508,7 +508,8 @@
 		Please.make_color = function( options ){
 			var color = [];
 			//clone base please options
-			var color_options = copy_object( make_color_default );
+			var color_options = copy_object( make_color_default ),
+				base_color = null;
 
 			if( options !== null ){
 			//override base Please options
@@ -520,13 +521,13 @@
 			}
 			//first, check for a base color
 			if ( color_options.base_color.length > 0 ) {
-				color_options.base_color = Please.NAME_to_HSV( color_options.base_color );
+				base_color = Please.NAME_to_HSV( color_options.base_color );
 			}
 			for ( var i = 0; i < color_options.colors_returned; i++ ) {
 				var random_hue = random_int( 0, 360 );
 				var hue,saturation,value;
-				if( color_options.base_color.length > 0 ){
-					hue = clamp( random_int( ( color_options.base_color.h - 5 ), ( color_options.base_color.h + 5 )), 0, 360);
+				if( base_color !== null ){
+					hue = clamp( random_int( ( base_color.h - 5 ), ( base_color.h + 5 )), 0, 360);
 					saturation = random_float( 0.4, 0.85 );
 					value = random_float( 0.4, 0.85 );
 					color.push({h: hue, s: saturation, v: value});