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 2013/08/28 05:59:28 UTC
svn commit: r1518065 - in
/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user:
ChatPanel.java ChatToolbar.html
Author: solomax
Date: Wed Aug 28 03:59:28 2013
New Revision: 1518065
URL: http://svn.apache.org/r1518065
Log:
[OPENMEETINGS-558] minor issues are fixed, code clean up
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.html
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1518065&r1=1518064&r2=1518065&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Wed Aug 28 03:59:28 2013
@@ -95,33 +95,32 @@ public class ChatPanel extends UserPanel
});
add(new EmoticonsBehavior("#" + MESSAGE_AREA_ID));
add(new WebMarkupContainer("messages").setMarkupId(MESSAGE_AREA_ID));
- final Form<Void> f = new Form<Void>("sendForm");
ChatToolbar toolbar = new ChatToolbar("toolbarContainer");
- f.add(toolbar);
final WysiwygEditor chatMessage = new WysiwygEditor("chatMessage", Model.of(""), toolbar);
- f.add(chatMessage);
- f.add(new Button("send").add(new AjaxFormSubmitBehavior("onclick"){
- private static final long serialVersionUID = -3746739738826501331L;
-
- protected void onSubmit(AjaxRequestTarget target) {
- ChatDao dao = getBean(ChatDao.class);
- ChatMessage m = new ChatMessage();
- m.setMessage(chatMessage.getDefaultModelObjectAsString());
- m.setSent(new Date());
- m.setFromUser(getBean(UsersDao.class).get(getUserId()));
- dao.update(m);
- IWebSocketConnectionRegistry reg = IWebSocketSettings.Holder.get(getApplication()).getConnectionRegistry();
- for (IWebSocketConnection c : reg.getConnections(getApplication())) {
- try {
- c.sendMessage(getMessage(m).toString());
- } catch(Exception e) {
- log.error("Error while sending message", e);
- }
- }
- chatMessage.setDefaultModelObject("");
- target.add(f);
- };
- }));
- add(f.setOutputMarkupId(true));
+ add(new Form<Void>("sendForm").add(
+ toolbar
+ , chatMessage.setOutputMarkupId(true)
+ , new Button("send").add(new AjaxFormSubmitBehavior("onclick"){
+ private static final long serialVersionUID = -3746739738826501331L;
+
+ protected void onSubmit(AjaxRequestTarget target) {
+ ChatDao dao = getBean(ChatDao.class);
+ ChatMessage m = new ChatMessage();
+ m.setMessage(chatMessage.getDefaultModelObjectAsString());
+ m.setSent(new Date());
+ m.setFromUser(getBean(UsersDao.class).get(getUserId()));
+ dao.update(m);
+ IWebSocketConnectionRegistry reg = IWebSocketSettings.Holder.get(getApplication()).getConnectionRegistry();
+ for (IWebSocketConnection c : reg.getConnections(getApplication())) {
+ try {
+ c.sendMessage(getMessage(m).toString());
+ } catch(Exception e) {
+ log.error("Error while sending message", e);
+ }
+ }
+ chatMessage.setDefaultModelObject("");
+ target.add(chatMessage);
+ };
+ })));
}
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.html?rev=1518065&r1=1518064&r2=1518065&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatToolbar.html Wed Aug 28 03:59:28 2013
@@ -33,7 +33,7 @@
</style>
<script type="text/javascript">
function emtClick(emoticon) {
- var editor = $('#chatMessage');
+ var editor = $('#chatMessage .wysiwyg-editor');
editor.html(editor.html() + ' ' + emoticon + ' ');
}
$(function() {