Index: lams_learning/web/includes/javascript/presence.js =================================================================== diff -u -re64a90c0cc74118c5b88f5cbae323065abd59cac -rbe6b9658350d706f615e5ce3e4a6b96b8513c5ee --- lams_learning/web/includes/javascript/presence.js (.../presence.js) (revision e64a90c0cc74118c5b88f5cbae323065abd59cac) +++ lams_learning/web/includes/javascript/presence.js (.../presence.js) (revision be6b9658350d706f615e5ce3e4a6b96b8513c5ee) @@ -214,18 +214,25 @@ // skip another attempt if previous did not return yet (slow server?) if (!pollInProgress) { pollInProgress = true; - var selected = presenceChatTabs.tabs('option','selected'); - var from = getUserFromTabIndex(selected); - if (groupChatInfo.nick == from) { - from = null; + var from = null; + var selected = null; + var lastMessageUid = null; + var getMessages = presenceShown && presenceImEnabled; + if (getMessages) { + selected = presenceChatTabs.tabs('option','active'); + from = getUserFromTabIndex(selected); + if (groupChatInfo.nick == from) { + from = null; + } + lastMessageUid = roster.lastMessageUids[from ? from : 'group']; } - + $.ajax({ url : actionUrl, data : {'method' : 'getChatContent', 'lessonID' : lessonId, - 'presenceShown' : presenceShown, - 'lastMessageUid' : roster.lastMessageUids[from ? from : 'group'], + 'getMessages' : getMessages, + 'lastMessageUid' : lastMessageUid, 'to' : nickname, 'from' : from },