Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

5 years ago · 092ccdd7a4
parent 9e75d04b76 c8f7ceba81
commit 092ccdd7a4
1 changed files with 12 additions and 8 deletions
--- a/main/template/default/chat/chat.tpl
+++ b/main/template/default/chat/chat.tpl
@ -81,6 +81,7 @@ $(function () {
                    friend: ChChat.currentFriend
                })
                .done(function (response) {
+                    try {
                        if (response.data.history) {
                            ChChat._historySize = response.data.oldFileSize;
                            ChChat.setHistory(response.data.history);
@ -90,6 +91,9 @@ $(function () {
                            ChChat.usersOnline = response.data.usersOnline;
                            ChChat.setConnectedUsers(response.data.userList);
                        }
+                    } catch (error) {
+                        console.error(error);
+                    }
                });
        },
        setHistory: function (messageList) {