diff --git a/src/static/js/chat.js b/src/static/js/chat.js index 2bf233f7..fb01befe 100644 --- a/src/static/js/chat.js +++ b/src/static/js/chat.js @@ -54,16 +54,17 @@ var chat = (function() isStuck = false; } }, - chatAndUsers: function(status){ - if(status || $('#options-chatandusers').prop('checked')){ + chatAndUsers: function(fromInitialCall) + { + if(fromInitialCall || $('#options-chatandusers').prop('checked')){ padcookie.setPref("chatAndUsers", true); chat.stickToScreen(true); + $('#options-stickychat').prop('checked', true) $('#options-stickychat').prop("disabled", "disabled"); $('#users').addClass("chatAndUsers"); $("#chatbox").addClass("chatAndUsersChat"); }else{ padcookie.setPref("chatAndUsers", false); - chat.stickToScreen(false); $('#options-stickychat').prop("disabled", false); $('#users').removeClass("chatAndUsers"); $("#chatbox").removeClass("chatAndUsersChat"); diff --git a/src/static/js/pad.js b/src/static/js/pad.js index 7c2e22c7..77bfab7f 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -784,6 +784,7 @@ var pad = { handleIsFullyConnected: function(isConnected, isInitialConnect) { pad.determineChatVisibility(isConnected && !isInitialConnect); + pad.determineChatAndUsersVisibility(isConnected && !isInitialConnect); pad.determineAuthorshipColorsVisibility(); }, determineChatVisibility: function(asNowConnectedFeedback){ @@ -796,7 +797,7 @@ var pad = { $('#options-stickychat').prop("checked", false); // set the checkbox for off } }, - determineChatAndUsersVisibility: function(){ + determineChatAndUsersVisibility: function(asNowConnectedFeedback){ var chatAUVisCookie = padcookie.getPref('chatAndUsersVisible'); if(chatAUVisCookie){ // if the cookie is set for chat always visible chat.chatAndUsers(true); // stick it to the screen