Index: lams_learning/web/includes/javascript/presence.js =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/includes/javascript/presence.js,v diff -u -r1.1 -r1.2 --- lams_learning/web/includes/javascript/presence.js 30 Oct 2012 17:46:52 -0000 1.1 +++ lams_learning/web/includes/javascript/presence.js 5 Jul 2013 13:54:41 -0000 1.2 @@ -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 },