libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

should be final logic for chatandusers

Browse source
This commit is contained in:
John McLear 2015-02-09 19:11:35 +00:00
parent 5245d2b797
commit b216f9271b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ 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;
@ -57,14 +58,16 @@ var chat = (function()
chatAndUsers: function(fromInitialCall) chatAndUsers: function(fromInitialCall)
{ {
var toEnable = $('#options-chatandusers').is(":checked"); var toEnable = $('#options-chatandusers').is(":checked");
if(toEnable || fromInitialCall){ if(toEnable || !userAndChat || 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-chatandusers').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");
// redraw // redraw
userAndChat = true;
padeditbar.redrawHeight() padeditbar.redrawHeight()
}else{ }else{
padcookie.setPref("chatAndUsers", false); padcookie.setPref("chatAndUsers", false);