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 04:30:00 UTC
svn commit: r1518054 - in
/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user:
ChatPanel.html ChatPanel.java ChatToolbar.html
Author: solomax
Date: Wed Aug 28 02:30:00 2013
New Revision: 1518054
URL: http://svn.apache.org/r1518054
Log:
[OPENMEETINGS-558] minor issues are fixed, code clean up
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html
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.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html?rev=1518054&r1=1518053&r2=1518054&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html Wed Aug 28 02:30:00 2013
@@ -30,7 +30,9 @@
}
function addChatMessageInternal(m) {
if (m && m.type == "chat") {
- $('#messageArea').append('<div><span class="date">' + m.msg.sent + '</span>' + m.msg.message + '</div>');
+ var msg = $('<div><span class="date">' + m.msg.sent + '</span>' + m.msg.message + '</div>');
+ $('#messageArea').append(msg);
+ msg[0].scrollIntoView();
}
}
function addChatMessage(m) {
@@ -46,12 +48,11 @@
</wicket:head>
<wicket:panel>
<div id="chat">
- <!-- FIXME select emotion button is required! -->
<div id="controlBlock" onclick="toggleChat();"><div id="control" class="ui-icon ui-icon-carat-1-n sort-icon"></div></div>
<div wicket:id="messages"></div>
<form wicket:id="sendForm">
<div wicket:id="toolbarContainer"></div>
- <div wicket:id="message"></div>
+ <div id="chatMessage" wicket:id="chatMessage"></div>
<input type="submit" wicket:id="send"/>
</form>
</div>
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=1518054&r1=1518053&r2=1518054&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 02:30:00 2013
@@ -40,7 +40,8 @@ import org.apache.wicket.markup.head.OnD
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.ws.IWebSocketSettings;
import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import org.apache.wicket.protocol.ws.api.IWebSocketConnectionRegistry;
@@ -54,7 +55,7 @@ public class ChatPanel extends UserPanel
private static final Logger log = Red5LoggerFactory.getLogger(ChatPanel.class, webAppRootKey);
private static final long serialVersionUID = -9144707674886211557L;
private static final String MESSAGE_AREA_ID = "messageArea";
- private String message;
+ private IModel<String> messageModel = Model.of("");
private JSONObject getMessage(ChatMessage m) throws JSONException {
return new JSONObject()
@@ -99,14 +100,15 @@ public class ChatPanel extends UserPanel
final Form<Void> f = new Form<Void>("sendForm");
ChatToolbar toolbar = new ChatToolbar("toolbarContainer");
f.add(toolbar);
- f.add(new WysiwygEditor("message", new PropertyModel<String>(ChatPanel.this, "message"), toolbar).setOutputMarkupId(true));
+ final WysiwygEditor chatMessage = new WysiwygEditor("chatMessage", messageModel, 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(message);
+ m.setMessage(messageModel.getObject());
m.setSent(new Date());
m.setFromUser(getBean(UsersDao.class).get(getUserId()));
dao.update(m);
@@ -118,11 +120,11 @@ public class ChatPanel extends UserPanel
log.error("Error while sending message", e);
}
}
- ChatPanel.this.message = "";
+ messageModel = Model.of(""); //HACK need to be fixed in WysiwygEditor
+ chatMessage.setDefaultModel(messageModel);
target.add(f);
};
}));
add(f.setOutputMarkupId(true));
}
-
}
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=1518054&r1=1518053&r2=1518054&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 02:30:00 2013
@@ -23,7 +23,7 @@
<wicket:panel>
<script type="text/javascript">
function emtClick(emoticon) {
- var editor = $($('#bToolbar').attr('data-target'));
+ var editor = $('#chatMessage');
editor.html(editor.html() + ' ' + emoticon + ' ');
}
$(function() {