Author: solomax
Date: Mon May 27 04:59:06 2013
New Revision: 1486516
URL: http://svn.apache.org/r1486516
Log:
[OPENMEETINGS-646] emotions are added
Modified:
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.java
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1486516&r1=1486515&r2=1486516&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Mon May 27 04:59:06 2013
@@ -253,13 +253,16 @@
<dependency org="org.apache.wicket"
name="wicket-native-websocket-tomcat" rev="0.9" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-core" rev="6.7.0" conf="openmeetings->*"
transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-core" rev="6.8.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui" rev="6.7.0" conf="openmeetings->*" transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui" rev="6.8.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-calendar" rev="6.7.0" conf="openmeetings->*"
transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-calendar" rev="6.8.0" conf="openmeetings->*"
transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="com.googlecode.wicket-jquery-ui"
name="wicket-jquery-ui-plugins" rev="6.8.0" conf="openmeetings->*"
transitive="false">
<include type="jar" />
</dependency>
<dependency org="ro.fortsoft.wicket.dashboard"
name="wicket-dashboard-core" rev="0.8" conf="openmeetings->*"
transitive="false">
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.html?rev=1486516&r1=1486515&r2=1486516&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.html
Mon May 27 04:59:06 2013
@@ -28,11 +28,17 @@
.addClass('ui-icon-carat-1-' +
(chat.height() < 20 ? 's' : 'n'));
chat.animate({ height: chat.height() < 20 ?
"300px" : "16px" }, 1000);
}
- function addChatMessage(m) {
+ function addChatMessageInternal(m) {
if (m && m.type == "chat") {
$('#messageArea').append('<div>' +
m.msg.message + '</div>');
}
}
+ function addChatMessage(m) {
+ if (m && m.type == "chat") {
+ addChatMessageInternal(m)
+ $('#messageArea').emoticonize();
+ }
+ }
Wicket.Event.subscribe("/websocket/message",
function(jqEvent, msg) {
addChatMessage(jQuery.parseJSON(msg));
});
@@ -40,6 +46,7 @@
</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">
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.java?rev=1486516&r1=1486515&r2=1486516&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/ChatPanel.java
Mon May 27 04:59:06 2013
@@ -46,9 +46,12 @@ import org.apache.wicket.protocol.ws.api
import org.apache.wicket.protocol.ws.api.IWebSocketConnectionRegistry;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+
+import com.googlecode.wicket.jquery.ui.plugins.emoticons.EmoticonsBehavior;
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 JSONObject getMessage(ChatMessage m) throws JSONException {
@@ -65,6 +68,7 @@ public class ChatPanel extends UserPanel
setOutputMarkupId(true);
setMarkupId(id);
+ //TODO script should be moved from the html to parameterized
file!
add(new Behavior() {
private static final long serialVersionUID =
-2205036360048419129L;
@@ -74,9 +78,10 @@ public class ChatPanel extends UserPanel
try {
StringBuilder sb = new StringBuilder();
for (ChatMessage m : dao.get(0,
Integer.MAX_VALUE)) {
-
sb.append("addChatMessage(").append(getMessage(m).toString()).append(");");
+
sb.append("addChatMessageInternal(").append(getMessage(m).toString()).append(");");
}
if (sb.length() > 0) {
+
sb.append("$('#").append(MESSAGE_AREA_ID).append("').emoticonize();");
response.render(OnDomReadyHeaderItem.forScript(sb.toString()));
}
} catch (JSONException e) {
@@ -85,7 +90,8 @@ public class ChatPanel extends UserPanel
super.renderHead(component, response);
}
});
- add(new
WebMarkupContainer("messages").setMarkupId("messageArea"));
+ add(new EmoticonsBehavior("#" + MESSAGE_AREA_ID));
+ add(new
WebMarkupContainer("messages").setMarkupId(MESSAGE_AREA_ID));
final Form<Void> f = new Form<Void>("sendForm");
f.add(new TextArea<String>("message", new
PropertyModel<String>(ChatPanel.this, "message")).setOutputMarkupId(true));
f.add(new Button("send").add(new
AjaxFormSubmitBehavior("onclick"){
