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,14 +81,18 @@ $(function () {
                    friend: ChChat.currentFriend
                })
                .done(function (response) {
-                    if (response.data.history) {
-                        ChChat._historySize = response.data.oldFileSize;
-                        ChChat.setHistory(response.data.history);
-                    }
-
-                    if (response.data.userList) {
-                        ChChat.usersOnline = response.data.usersOnline;
-                        ChChat.setConnectedUsers(response.data.userList);
+                    try {
+                        if (response.data.history) {
+                            ChChat._historySize = response.data.oldFileSize;
+                            ChChat.setHistory(response.data.history);
+                        }
+
+                        if (response.data.userList) {
+                            ChChat.usersOnline = response.data.usersOnline;
+                            ChChat.setConnectedUsers(response.data.userList);
+                        }
+                    } catch (error) {
+                        console.error(error);
                    }
                });
        },