Index: lams_learning/web/presenceChat.jsp =================================================================== diff -u -re64a90c0cc74118c5b88f5cbae323065abd59cac -rbe6b9658350d706f615e5ce3e4a6b96b8513c5ee --- lams_learning/web/presenceChat.jsp (.../presenceChat.jsp) (revision e64a90c0cc74118c5b88f5cbae323065abd59cac) +++ lams_learning/web/presenceChat.jsp (.../presenceChat.jsp) (revision be6b9658350d706f615e5ce3e4a6b96b8513c5ee) @@ -12,9 +12,9 @@ var lamsUrl = ""; var actionUrl = lamsUrl + "PresenceChat.do"; var lessonId = "${param.lessonID}"; - var presenceEnabled = "${param.presenceEnabledPatch}"; - var presenceShown = ${param.presenceShown == 'true'}; - var presenceImEnabled = "${param.presenceImEnabled}"; + var presenceEnabled = ${param.presenceEnabledPatch eq 'true'}; + var presenceShown = ${param.presenceShown eq 'true'}; + var presenceImEnabled = ${param.presenceImEnabled eq 'true'}; var nickname = "" + " " + ""; // labels used in JS file @@ -37,34 +37,28 @@ // otherwise enable presence chat else { // if presence im is enabled - if (presenceEnabled == 'true') { + if (presenceEnabled) { // make visible presenceChat.removeClass("startHidden"); // create chat tabs - presenceChatTabs = $("#presenceChatTabs").tabs({'scrollable' : true, - // set default class for new panel - 'panelTemplate' : '
' - }); - - // bind the select function to do extra stuff - presenceChatTabs.bind('tabsselect', function(event, ui) { - lastMessageUid = null; - // remove visual indicators of new message - var nick = getUserFromTabIndex(ui.index); - var tag = nickToTag(nick); - $("#" + tagToTabLabel(tag)).removeClass('presenceTabNewMessage'); - - if (nick != groupChatInfo.nick) { - $("#" + tagToListing(tag)).removeClass('presenceListingNewMessage'); + presenceChatTabs = $("#presenceChatTabs").tabs({ + 'scrollable' : true, + // set default class for new panel + 'panelTemplate' : '
', + 'activate' : function(event, ui) { + // remove visual indicators of new message + var nick = getUserFromTabIndex(presenceChatTabs.tabs('option','active')); + var tag = nickToTag(nick); + $("#" + tagToTabLabel(tag)).removeClass('presenceTabNewMessage'); + + if (nick != groupChatInfo.nick) { + $("#" + tagToListing(tag)).removeClass('presenceListingNewMessage'); + } + + updateChat(); } - - // scroll to the clicked tab - presenceChatTabs.tabs('scrollTo', ui.tab.offsetLeft); - }); - - // bind the show function to do extra stuff - presenceChatTabs.bind('tabsshow', updateChat); + }); } // create roster tab