mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-23 00:46:16 -04:00
added a colorPicker
This commit is contained in:
parent
5d30c8b4a5
commit
9d37d91ce1
8 changed files with 594 additions and 51 deletions
|
@ -513,7 +513,7 @@ var paduserlist = (function()
|
|||
}
|
||||
|
||||
var userData = {};
|
||||
userData.color = pad.getColorPalette()[info.colorId];
|
||||
userData.color = info.colorId;
|
||||
userData.name = info.name;
|
||||
userData.status = '';
|
||||
userData.activity = '';
|
||||
|
@ -703,7 +703,8 @@ var paduserlist = (function()
|
|||
{
|
||||
$("#myswatchbox").addClass('myswatchboxhoverable').removeClass('myswatchboxunhoverable');
|
||||
}
|
||||
$("#myswatch").css('background', pad.getColorPalette()[myUserInfo.colorId]);
|
||||
|
||||
$("#myswatch").css({'background-color': myUserInfo.colorId});
|
||||
}
|
||||
};
|
||||
return self;
|
||||
|
@ -718,20 +719,25 @@ function getColorPickerSwatchIndex(jnode)
|
|||
function closeColorPicker(accept)
|
||||
{
|
||||
if (accept)
|
||||
{
|
||||
var newColorId = getColorPickerSwatchIndex($("#colorpickerswatches .picked"));
|
||||
if (newColorId >= 0)
|
||||
{ // fails on NaN
|
||||
myUserInfo.colorId = newColorId;
|
||||
pad.notifyChangeColor(newColorId);
|
||||
{
|
||||
var newColor = $("#mycolorpickerpreview").css("background-color");
|
||||
var parts = newColor.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
|
||||
// parts now should be ["rgb(0, 70, 255", "0", "70", "255"]
|
||||
delete (parts[0]);
|
||||
for (var i = 1; i <= 3; ++i) {
|
||||
parts[i] = parseInt(parts[i]).toString(16);
|
||||
if (parts[i].length == 1) parts[i] = '0' + parts[i];
|
||||
}
|
||||
|
||||
var newColor = "#" +parts.join(''); // "0070ff"
|
||||
|
||||
myUserInfo.colorId = newColor;
|
||||
pad.notifyChangeColor(newColor);
|
||||
paduserlist.renderMyUserInfo();
|
||||
}
|
||||
else
|
||||
{
|
||||
pad.notifyChangeColor(previousColorId);
|
||||
paduserlist.renderMyUserInfo();
|
||||
//pad.notifyChangeColor(previousColorId);
|
||||
//paduserlist.renderMyUserInfo();
|
||||
}
|
||||
|
||||
colorPickerOpen = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue