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/02 08:30:01 UTC
openmeetings git commit: [OPENMEETINGS-1769] chat template is improved
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x c106713a2 -> 16d558240
[OPENMEETINGS-1769] chat template is improved
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/16d55824
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/16d55824
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/16d55824
Branch: refs/heads/4.0.x
Commit: 16d558240ac84775a11e64a35e9c12e5a83072a1
Parents: c106713
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Dec 2 15:29:53 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Dec 2 15:29:53 2017 +0700
----------------------------------------------------------------------
.../src/main/java/org/apache/openmeetings/web/user/chat/Chat.html | 1 +
.../main/java/org/apache/openmeetings/web/user/chat/chat-base.js | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/16d55824/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
index 0fe311b..674a08a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.html
@@ -43,6 +43,7 @@
<div class="clear"></div>
</div>
<div class='msg'></div>
+ <div class="clear"></div>
</div>
<div id="chat-accept-template" class='tick om-icon clickable' wicket:message="title:1190"
onclick='const e=$(this);chatActivity("accept", e.data("roomid"), e.data("msgid")); e.parent().remove();'></div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/16d55824/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 98826bd..105bcf2 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
@@ -216,6 +216,7 @@ var Chat = function() {
const btm = area.scrollTop() + area.innerHeight() >= area[0].scrollHeight;
if (lastDate !== cm.date) {
area.append(OmUtil.tmpl('#chat-date-template').html(cm.date));
+ lastDate = cm.date;
}
area.append(msg);
if (btm) {