Repository: openmeetings Updated Branches: refs/heads/master 2c333f2c3 -> 32fde7a85
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/32fde7a8 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/32fde7a8 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/32fde7a8 Branch: refs/heads/master Commit: 32fde7a85d6d25a140e93a4ff2d0c4f90fed2ca0 Parents: 2c333f2 Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 2 15:42:21 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 2 15:42:21 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/web/user/chat/chat.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/32fde7a8/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js index a45595d..45e0bcd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js @@ -1,7 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Chat = function() { - const chatTabs - , tabTemplate = "<li><a href='#{href}'>#{label}</a></li>" + const tabTemplate = "<li><a href='#{href}'>#{label}</a></li>" , msgTemplate = "<div class='clear' id='chat-msg-id-#{id}'><img class='profile' src='#{imgSrc}'/><span class='from' data-user-id='#{userId}'>#{from}</span><span class='date align-right'>#{sent}</span>#{msg}</div>" , acceptTemplate = "<div class='tick om-icon align-right clickable' data-msgid='#{msgid}' data-roomid='#{roomid}' onclick='const e=$(this);chatActivity('accept',e.data(\"roomid\"),e.data(\"msgid\"));e.parent().remove();'></div>" , infoTemplate = "<div class='user om-icon align-right clickable' data-user-id='#{userId}' onclick='const e=$(this);showUserInfo(e.data(\"userId\"));'></div>" @@ -13,7 +12,9 @@ var Chat = function() { , emoticon = new CSSEmoticon() , doneTypingInterval = 5000 //time in ms, 5 second for example ; - let openedHeight = "345px", allPrefix = "All", roomPrefix = "Room ", typingTimer, audio, s + let chatTabs, openedHeight = "345px", allPrefix = "All" + , roomPrefix = "Room ", typingTimer, audio, s; + try { audio = new Audio('./public/chat_message.mp3'); } catch (e) {
