diff --git a/main/chat/chat.php b/main/chat/chat.php index 4044e62382..77bf1c5bc3 100755 --- a/main/chat/chat.php +++ b/main/chat/chat.php @@ -1,4 +1,5 @@ TOOL_CHAT, - 'tool_id' => 0, - 'tool_id_detail' => 0, 'action' => 'start', 'action_details' => 'start-chat', ]; Event::registerLog($logInfo); -// View $externalCSS = [ 'jquery-emojiarea/jquery.emojiarea.css', 'jquery-textcomplete/jquery.textcomplete.css', diff --git a/main/inc/lib/CourseChatUtils.php b/main/inc/lib/CourseChatUtils.php index 36dfdf1efc..2021380b90 100644 --- a/main/inc/lib/CourseChatUtils.php +++ b/main/inc/lib/CourseChatUtils.php @@ -1,4 +1,5 @@ createQuery(" SELECT ccc FROM ChamiloCourseBundle:CChatConnected ccc - WHERE ccc.userId = :user AND ccc.cId = :course $extraCondition + WHERE ccc.userId = :user AND ccc.cId = :course $extraCondition ") ->setParameters([ 'user' => $this->userId, diff --git a/main/template/default/chat/chat.tpl b/main/template/default/chat/chat.tpl index 08f1cc6dcb..38ad4a35fc 100644 --- a/main/template/default/chat/chat.tpl +++ b/main/template/default/chat/chat.tpl @@ -136,18 +136,17 @@ $(function () { $('#chat-users').html(html); }, onPreviewListener: function () { - $ - .post(ChChat._ajaxUrl, { - action: 'preview', - 'message': $('textarea#chat-writer').val() - }) - .done(function (response) { - if (!response.status) { - return; - } + $.post(ChChat._ajaxUrl, { + action: 'preview', + 'message': $('textarea#chat-writer').val() + }) + .done(function (response) { + if (!response.status) { + return; + } - $('#html-preview').html(response.data.message); - }); + $('#html-preview').html(response.data.message); + }); }, onSendMessageListener: function (e) { e.preventDefault(); @@ -159,40 +158,38 @@ $(function () { var self = this; self.disabled = true; - $ - .post(ChChat._ajaxUrl, { - action: 'write', - message: $('textarea#chat-writer').val(), - friend: ChChat.currentFriend - }) - .done(function (response) { - self.disabled = false; + $.post(ChChat._ajaxUrl, { + action: 'write', + message: $('textarea#chat-writer').val(), + friend: ChChat.currentFriend + }) + .done(function (response) { + self.disabled = false; - if (!response.status) { - return; - } + if (!response.status) { + return; + } - $('textarea#chat-writer').val(''); - $(".emoji-wysiwyg-editor").html(''); - }); + $('textarea#chat-writer').val(''); + $(".emoji-wysiwyg-editor").html(''); + }); }, onResetListener: function (e) { if (!confirm("{{ 'ConfirmReset'|get_lang }}")) { e.preventDefault(); return; } - $ - .get(ChChat._ajaxUrl, { - action: 'reset', - friend: ChChat.currentFriend - }) - .done(function (response) { - if (!response.status) { - return; - } + $.get(ChChat._ajaxUrl, { + action: 'reset', + friend: ChChat.currentFriend + }) + .done(function (response) { + if (!response.status) { + return; + } - ChChat.setHistory(response.data); - }); + ChChat.setHistory(response.data); + }); }, init: function () { ChChat.track().done(function () { @@ -219,13 +216,13 @@ $(function () { $('body').on('click', '#chat-reset', ChChat.onResetListener); $('#preview').on('click', ChChat.onPreviewListener); + $('#emojis').on('click', function () { $('[data-toggle="tab"][href="#tab1"]').show().tab('show'); }); - $('textarea#chat-writer').emojiarea({ - button: '#emojis' - }); + + $('textarea#chat-writer').emojiarea({button: '#emojis'}); $('body').delay(1500).find('.emoji-wysiwyg-editor').textcomplete([{ match: /\B:([\-+\w]*)$/, @@ -271,6 +268,7 @@ $(function () { }], {}); $('button#chat-send-message').on('click', ChChat.onSendMessageListener); + $('#chat-users').on('click', 'div.chat-user', function (e) { e.preventDefault(); var jSelf = $(this),