mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-09 08:25:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge f12cb0dd58 into 6726ea6632

Browse source
This commit is contained in:
GitHub Merge Button 2012-07-12 01:34:46 -07:00
commit 4bfb9041c8
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,9 +62,10 @@ var chat = (function()
},
scrollDown: function()
{
if($('#options-scrollchat').is(':checked')){
if($('#chatbox').css("display") != "none"){
if($('#chatbox').css("display") != "none"){
if(!self.lastMessage || !self.lastMessage.position() || self.lastMessage.position().top < $('#chattext').height()) {
$('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow");
self.lastMessage = $('#chattext > p').eq(-1);
}
}
},

4
src/templates/pad.html
View file

@ -168,10 +168,6 @@
<input type="checkbox" id="options-linenoscheck" checked>
<label for="options-linenoscheck">Line numbers</label>
</p>
<p>
<input type="checkbox" id="options-scrollchat" checked>
<label for="options-scrollchat">Automatically Scroll Chat</label>
</p>
<p>
Font type:
<select id="viewfontmenu">