From c34c141b8e1f8444b4acf2ceb0251e85be869218 Mon Sep 17 00:00:00 2001 From: Ophir LOJKINE Date: Wed, 20 Nov 2013 22:51:32 +0100 Subject: [PATCH] Add a true color picker (jscolor from jscolor.com) --- client-data/board.html | 3 ++- client-data/js/board.js | 7 +------ package.json | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/client-data/board.html b/client-data/board.html index b8c57e3..63ba58c 100644 --- a/client-data/board.html +++ b/client-data/board.html @@ -8,6 +8,7 @@ + @@ -32,7 +33,7 @@

Configuration

- +
diff --git a/client-data/js/board.js b/client-data/js/board.js index 3c4e163..593cd12 100644 --- a/client-data/js/board.js +++ b/client-data/js/board.js @@ -252,14 +252,9 @@ Tools.positionElement = function (elem, x, y) { (function color (){ var chooser = document.getElementById("chooseColor"); - function update (){ - chooser.style.backgroundColor = chooser.value; - } - update(); - chooser.onkeyup = chooser.onchange = update; Tools.getColor = function(){ - return chooser.style.backgroundColor; + return chooser.value; }; })(); diff --git a/package.json b/package.json index e74e085..e7d07ab 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "collaborative", "whiteboard" ], - "version": "0.1.0-20", + "version": "0.1.0-28", "dependencies": { "node-static": "0.7.x", "socket.io": "0.9.x"