Author: solomax
Date: Wed Mar 1 07:52:23 2017
New Revision: 1784864
URL: http://svn.apache.org/viewvc?rev=1784864&view=rev
Log:
[OPENMEETINGS-1553] HTML chat messages are displayed as expected
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1784864&r1=1784863&r2=1784864&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Wed Mar 1 07:52:23 2017
@@ -40,10 +40,6 @@ var Chat = function() {
typingTimer = null;
chatActivity('typing_stop', $('.room.box').data('room-id'));
}
- function emtClick(emoticon) {
- var editor = $('#chatMessage .wysiwyg-editor');
- editor.html(editor.html() + ' ' + emoticon + ' ');
- }
function initToolbar() {
var emtBtn = $('#emoticons');
emtBtn.html('');
@@ -57,7 +53,7 @@ var Chat = function() {
var rowSize = 20;
var row = $('<tr></tr>');
for (var i = 0; i < emots.length; ++i) {
- row.append('<td><div class="emt" onclick="emtClick(\''
+ emots[i] + '\');">'
+ row.append('<td><div class="emt"
onclick="Chat.emtClick(\'' + emots[i] + '\');">'
+ emoticon.emoticonize(emots[i]) +
'</div></td>');
if (i != 0 && i % rowSize == 0) {
emotMenuList.append(row);
@@ -200,6 +196,10 @@ var Chat = function() {
this.close();
}
}
+ , emtClick: function(emoticon) {
+ var editor = $('#chatMessage .wysiwyg-editor');
+ editor.html(editor.html() + ' ' + emoticon + ' ');
+ }
};
}();
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js?rev=1784864&r1=1784863&r2=1784864&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
Wed Mar 1 07:52:23 2017
@@ -40,10 +40,6 @@ var Chat = function() {
typingTimer = null;
chatActivity('typing_stop', $('.room.box').data('room-id'));
}
- function emtClick(emoticon) {
- var editor = $('#chatMessage .wysiwyg-editor');
- editor.html(editor.html() + ' ' + emoticon + ' ');
- }
function initToolbar() {
var emtBtn = $('#emoticons');
emtBtn.html('');
@@ -57,7 +53,7 @@ var Chat = function() {
var rowSize = 20;
var row = $('<tr></tr>');
for (var i = 0; i < emots.length; ++i) {
- row.append('<td><div class="emt" onclick="emtClick(\''
+ emots[i] + '\');">'
+ row.append('<td><div class="emt"
onclick="Chat.emtClick(\'' + emots[i] + '\');">'
+ emoticon.emoticonize(emots[i]) +
'</div></td>');
if (i != 0 && i % rowSize == 0) {
emotMenuList.append(row);
@@ -200,6 +196,10 @@ var Chat = function() {
this.close();
}
}
+ , emtClick: function(emoticon) {
+ var editor = $('#chatMessage .wysiwyg-editor');
+ editor.html(editor.html() + ' ' + emoticon + ' ');
+ }
};
}();
