You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/12/25 10:33:17 UTC
openmeetings git commit: [OPENMEETINGS-1775] chat date block is fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 43cc810b0 -> fce7f3b9d
[OPENMEETINGS-1775] chat date block is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fce7f3b9
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fce7f3b9
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fce7f3b9
Branch: refs/heads/4.0.x
Commit: fce7f3b9d30f2bcda2b329bbd6b41b8b84d20859
Parents: 43cc810
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Dec 25 17:33:07 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Dec 25 17:33:07 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/web/user/chat/chat-base.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fce7f3b9/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
index 3779f43..dd12af3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
@@ -14,7 +14,7 @@ var Chat = function() {
;
let p, pp, ctrl, icon, tabs, openedHeight = "345px", openedWidth = "300px", allPrefix = "All"
, roomPrefix = "Room ", typingTimer, audio, roomMode = false, globalWidth = 600
- , editor = $('#chatMessage .wysiwyg-editor'), lastDate
+ , editor = $('#chatMessage .wysiwyg-editor')
;
try {
@@ -223,9 +223,9 @@ var Chat = function() {
$('#chat-msg-id-' + cm.id).remove();
}
const btm = area.scrollTop() + area.innerHeight() >= area[0].scrollHeight;
- if (lastDate !== cm.date) {
+ if (area.data('lastDate') !== cm.date) {
area.append(OmUtil.tmpl('#chat-date-template').html(cm.date));
- lastDate = cm.date;
+ area.data('lastDate', cm.date);
}
area.append(msg);
if (btm) {