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

fix issue with load of showuserandchat

This commit is contained in:
John McLear 2015-01-24 18:31:19 +00:00
parent af7cd91a82
commit f3e5682a0f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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