infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

try to make the color picker show the current color

pull/1/head
ansuz 2017-03-31 12:01:30 +02:00
parent 96dac80bd5
commit e2981c0223
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/whiteboard/main.js
View File

@ -52,10 +52,12 @@ define([
$width.on('change', updateBrushWidth);
var pickColor = function (cb) {
var pickColor = function (current, cb) {
// TODO find out why initial color is not being set
// http://jsfiddle.net/j3hZB/
var $picker = $('<input>', {
type: 'color',
value: module.color || '#000'
value: '#FFFFFF',
})
.css({
display: 'none',
@ -65,6 +67,7 @@ define([
cb(color);
});
setTimeout(function () {
$picker.val(current);
$picker.click();
});
};
@ -87,11 +90,13 @@ define([
.css({
'background-color': color,
})
// FIXME double click doesn't seem to work in chromium currently
.dblclick(function () {
pickColor(function (c) {
pickColor($color.css('background-color'), function (c) {
$color.css({
'background-color': c,
});
setColor(c);
});
// TODO commit chosen color to pad metadata:
// json.metadata.palette[i]
@ -205,9 +210,8 @@ define([
title: "choose a color",
'class': "fa fa-square rightside-button",
})
.text(' ')
.on('click', function () {
pickColor(function (color) {
pickColor($color.css('background-color'), function (color) {
setColor(color);
})
});