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 2015/12/03 20:21:59 UTC
svn commit: r1717840 - in /openmeetings:
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/
trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/
Author: solomax
Date: Thu Dec 3 19:21:59 2015
New Revision: 1717840
URL: http://svn.apache.org/viewvc?rev=1717840&view=rev
Log:
[OPENMEETINGS-887] action filtering is added to the global chat
Modified:
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1717840&r1=1717839&r2=1717840&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Thu Dec 3 19:21:59 2015
@@ -143,6 +143,7 @@ public class ChatPanel extends BasePanel
.put("img", getUrl(getRequestCycle(), m.getFromUser().getId()))
)
+ .put("actions", curUserId == m.getFromUser().getId() ? "short" : "full")
.put("sent", getDateFormat().format(m.getSent())));
}
return new JSONObject()
Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js?rev=1717840&r1=1717839&r2=1717840&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js Thu Dec 3 19:21:59 2015
@@ -100,8 +100,10 @@ function addChatMessage(m) {
var date = msg.children('.date');
date.after(infoTemplate.replace(/#\{userId\}/g, cm.from.id));
date.after(addTemplate.replace(/#\{userId\}/g, cm.from.id));
- date.after(messageTemplate.replace(/#\{userId\}/g, cm.from.id));
- date.after(inviteTemplate.replace(/#\{userId\}/g, cm.from.id));
+ if ("full" == cm.actions) {
+ date.after(messageTemplate.replace(/#\{userId\}/g, cm.from.id));
+ date.after(inviteTemplate.replace(/#\{userId\}/g, cm.from.id));
+ }
if (cm.needModeration) {
msg.append(acceptTemplate.replace(/#\{msgid\}/g, cm.id).replace(/#\{roomid\}/g, cm.scope.substring(9)));
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1717840&r1=1717839&r2=1717840&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Thu Dec 3 19:21:59 2015
@@ -143,6 +143,7 @@ public class ChatPanel extends BasePanel
.put("img", getUrl(getRequestCycle(), m.getFromUser().getId()))
)
+ .put("actions", curUserId == m.getFromUser().getId() ? "short" : "full")
.put("sent", getDateFormat().format(m.getSent())));
}
return new JSONObject()
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js?rev=1717840&r1=1717839&r2=1717840&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js Thu Dec 3 19:21:59 2015
@@ -100,8 +100,10 @@ function addChatMessage(m) {
var date = msg.children('.date');
date.after(infoTemplate.replace(/#\{userId\}/g, cm.from.id));
date.after(addTemplate.replace(/#\{userId\}/g, cm.from.id));
- date.after(messageTemplate.replace(/#\{userId\}/g, cm.from.id));
- date.after(inviteTemplate.replace(/#\{userId\}/g, cm.from.id));
+ if ("full" == cm.actions) {
+ date.after(messageTemplate.replace(/#\{userId\}/g, cm.from.id));
+ date.after(inviteTemplate.replace(/#\{userId\}/g, cm.from.id));
+ }
if (cm.needModeration) {
msg.append(acceptTemplate.replace(/#\{msgid\}/g, cm.id).replace(/#\{roomid\}/g, cm.scope.substring(9)));
}