fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

and even mroe polish

This commit is contained in:
John McLear 2015-02-09 18:36:11 +00:00
parent 8c6507e78c
commit 5245d2b797
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/static/css/pad.css
View File

@ -897,7 +897,7 @@ input[type=checkbox] {
#connectivity, #connectivity,
#users { #users {
position: absolute; position: absolute;
top: 36px; top: 38px;
right: 20px; right: 20px;
display: none; display: none;
z-index: 500; z-index: 500;

6
src/static/js/chat.js
View File

@ -22,7 +22,6 @@ var hooks = require('./pluginfw/hooks');
var chat = (function() var chat = (function()
{ {
var isStuck = false; var isStuck = false;
var userAndChat = false;
var gotInitialMessages = false; var gotInitialMessages = false;
var historyPointer = 0; var historyPointer = 0;
var chatMentions = 0; var chatMentions = 0;
@ -58,14 +57,15 @@ var chat = (function()
chatAndUsers: function(fromInitialCall) chatAndUsers: function(fromInitialCall)
{ {
var toEnable = $('#options-chatandusers').is(":checked"); var toEnable = $('#options-chatandusers').is(":checked");
if(toEnable || !userAndChat || fromInitialCall){ if(toEnable || fromInitialCall){
padcookie.setPref("chatAndUsers", true); padcookie.setPref("chatAndUsers", true);
chat.stickToScreen(true); chat.stickToScreen(true);
$('#options-stickychat').prop('checked', true) $('#options-stickychat').prop('checked', true)
$('#options-stickychat').prop("disabled", "disabled"); $('#options-stickychat').prop("disabled", "disabled");
$('#users').addClass("chatAndUsers"); $('#users').addClass("chatAndUsers");
$("#chatbox").addClass("chatAndUsersChat"); $("#chatbox").addClass("chatAndUsersChat");
userAndChat = true; // redraw
padeditbar.redrawHeight()
}else{ }else{
padcookie.setPref("chatAndUsers", false); padcookie.setPref("chatAndUsers", false);
$('#options-stickychat').prop("disabled", false); $('#options-stickychat').prop("disabled", false);

3
src/static/js/pad_editbar.js
View File

@ -187,6 +187,9 @@ var padeditbar = (function()
$('#editorcontainer').css("top", containerTop); $('#editorcontainer').css("top", containerTop);
// make sure pop ups are in the right place
$('.popup').css("top", $('#editorcontainer').offset().top + "px");
// If sticky chat is enabled.. // If sticky chat is enabled..
if($('#options-stickychat').is(":checked")){ if($('#options-stickychat').is(":checked")){
$('#chatbox').css("top", $('#editorcontainer').offset().top + "px"); $('#chatbox').css("top", $('#editorcontainer').offset().top + "px");