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

Fix the color picker in Chrome and hide the buttons when not supported

pull/1/head
yflory 2016-10-10 18:21:18 +02:00
parent 91b4446c0b
commit b23fe783e3
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/slide/inner.html
View File

@ -136,6 +136,9 @@
background-position: bottom;
background-repeat: repeat-x;
}
#colorPicker_check {
display: block;
}
</style>
</head>
<body>
@ -147,6 +150,7 @@
<div id="content"></div>
</div>
<div id="nope"></div>
<div id="colorPicker_check"></div>
</body>
</html>

22
www/slide/main.js
View File

@ -458,21 +458,31 @@ define([
'style': 'font-family: FontAwesome; font-weight: bold; color: #fff; background: #000;',
title: Messages.colorButton + '\n' + Messages.colorButtonTitle
});
$testColor = $('<input>', { type: 'color' });
if ($testColor.attr('type') !== "color") {alert('not supported'); return;}
$testColor = $('<input>', { type: 'color', value: '!' });
var $check = $pad.contents().find("#colorPicker_check");
if ($testColor.attr('type') !== "color" || $testColor.val() === '!') { return; } // TODO
$back.on('click', function() {
$('<input>', { type: 'color', value: backColor })
var $picker = $('<input>', { type: 'color', value: backColor })
.on('change', function() {
updateColors(undefined, this.value);
onLocal();
}).click();
});
$check.append($picker);
setTimeout(function() {
$picker.click();
}, 0);
});
$text.on('click', function() {
$('<input>', { type: 'color', value: textColor })
var $picker = $('<input>', { type: 'color', value: textColor })
.on('change', function() {
updateColors(this.value, undefined);
onLocal();
}).click();
$check.html('');
});
$check.append($picker);
setTimeout(function() {
$picker.click();
}, 0);
});
$rightside.append($back).append($text);