Fixed arrayToRGB when array is a string

michaelgrosner · Feb 7, 2012 · 441579a · 441579a
1 parent b4b9585
commit 441579a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/CanvasContext.coffee b/CanvasContext.coffee
@@ -1,5 +1,5 @@
 class CanvasContext
-	constructor: (@canvas_tag) ->
+	constructor: (@canvas_tag, @background_color = "#ffffff") ->
 		@elements = []
 
 		try	
@@ -15,16 +15,13 @@ class CanvasContext
 				@resizeToWindow()
 				@drawAll()
 
-		# Background color of the canvas
-		# TODO: Embedder changable?
-		@background_color = [255, 255, 255]
-
 		# Prevent highlighting on canvas, something which often happens
 		# while clicking and dragging
 		$(@canvas).css
 			 "user-select": "none"
 			 "-moz-user-select": "none"
 			 "-webkit-user-select": "none"
+			 "background-color": arrayToRGB @background_color
 
 	resizeToWindow: =>
 		@canvas.width = window.innerWidth

diff --git a/main.coffee b/main.coffee
@@ -73,11 +73,12 @@ hexToRGBArray = (h) ->
 
 arrayToRGB = (a) ->
 	if typeof a == 'string'
-		if a.startswith "#" and a.length == 7
+		if a.startswith "#"
 			console.log "hex"
 			return a
 		else
-			alert "Improperly formatted string -> color. Must be of the form #XXXXXX"
+			alert "Improperly formatted string -> color. \
+					Must be of the form #XXXXXX"
 
 	if not a?
 		a = randomRGB()