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 2020/04/13 02:11:47 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2250] icons at
contacts&messages are fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new dd2f65f [OPENMEETINGS-2250] icons at contacts&messages are fixed
dd2f65f is described below
commit dd2f65fbca10fde5eeedbfb973afd73f81ce65b0
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Apr 13 09:11:29 2020 +0700
[OPENMEETINGS-2250] icons at contacts&messages are fixed
---
.../openmeetings/web/user/profile/MessagesContactsPanel.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index a5c7700..2713f1b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -625,15 +625,19 @@ public class MessagesContactsPanel extends UserBasePanel {
allContacts.setDefaultModelObject(contactDao.getContactsByUserAndStatus(getUserId(), false).size());
if (target != null) {
target.add(contacts);
- target.appendJavaScript("$('.messages .user.om-icon.clickable').off().click(function() {showUserInfo($(this).data('user-id'));});");
- target.appendJavaScript("$('.messages .new-email.om-icon.clickable').click(function() {privateMessage($(this).data('user-id'));});");
+ target.appendJavaScript(getContactClickHandlers());
}
}
+ private CharSequence getContactClickHandlers() {
+ return "$('.messages .user.om-icon.clickable').off().click(function() {showUserInfo($(this).data('user-id'));});"
+ + "$('.messages .new-email.om-icon.clickable').click(function() {privateMessage($(this).data('user-id'));});";
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("$('.email.new.btn').click(privateMessage)"));
+ response.render(OnDomReadyHeaderItem.forScript("$('.email.new.btn').click(function() {privateMessage();});" + getContactClickHandlers()));
}
@Override