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

merged develop back in

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2012-11-13 07:43:48 -08:00
commit 6de7634357
40 changed files with 9664 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/css/iframe_editor.css
View file

@ -126,7 +126,7 @@ body.doesWrap {
.sidedivdelayed { /* class set after sizes are set */
background-color: #eee;
color: #888 !important;
border-right: 1px solid #999;
border-right: 1px solid #ccc;
}
.sidedivhidden {
display: none;

2
src/static/js/chat.js
View file

@ -150,7 +150,7 @@ var chat = (function()
$("#chatinput").keypress(function(evt)
{
//if the user typed enter, fire the send
if(evt.which == 13)
if(evt.which == 13 || evt.which == 10)
{
evt.preventDefault();
self.send();

4
src/static/js/pad.js
View file

@ -397,6 +397,10 @@ function handshake()
});
// Bind the colorpicker
var fb = $('#colorpicker').farbtastic({ callback: '#mycolorpickerpreview', width: 220});
// Bind the read only button
$('#readonlyinput').on('click',function(){
padeditbar.setEmbedLinks();
});
}
var pad = {