mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 00:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

added a colorPicker

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-08-20 18:22:10 +01:00
parent 5d30c8b4a5
commit 9d37d91ce1
8 changed files with 594 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
static/js/pad2.js
View file

@ -226,6 +226,12 @@ function handshake()
clientVars = obj;
clientVars.userAgent = "Anonymous";
clientVars.collab_client_vars.clientAgent = "Anonymous";
//translate old colorIDs to RGB strings
if(typeof clientVars.userColor == "number")
{
clientVars.userColor = clientVars.colorPalette[clientVars.userColor];
}
//initalize the pad
pad.init();
@ -264,6 +270,9 @@ function handshake()
}
}
});
// Bind the colorpicker
var fb = $('#colorpicker').farbtastic({ callback: '#mycolorpickerpreview', width: 220});
}
var pad = {
@ -363,6 +372,7 @@ var pad = {
colorId: clientVars.userColor,
userAgent: pad.getDisplayUserAgent()
};
if (clientVars.specialKey)
{
pad.myUserInfo.specialKey = clientVars.specialKey;
@ -786,7 +796,7 @@ var pad = {
},
preloadImages: function()
{
var images = ['../static/img/colorpicker.gif'];
var images = []; // Removed as we now use CSS and JS for colorpicker
function loadNextImage()
{