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 2017/11/16 04:29:51 UTC
openmeetings git commit: [OPENMEETINGS-1757] emotions and links in
chat are fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 431412bf1 -> 8d4e3e511
[OPENMEETINGS-1757] emotions and links in chat are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8d4e3e51
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8d4e3e51
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8d4e3e51
Branch: refs/heads/4.0.x
Commit: 8d4e3e511e5587d8055f01723b27c1ff1c80af74
Parents: 431412b
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Nov 16 11:29:41 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Nov 16 11:29:41 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/user/chat/Chat.java | 2 +-
.../java/org/apache/openmeetings/web/user/chat/chat.js | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d4e3e51/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index 3d66933..510817b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -234,7 +234,7 @@ public class Chat extends Panel {
WebSocketHelper.sendAll(msg.toString());
}
chatMessage.setDefaultModelObject("");
- target.add(chatMessage);
+ target.appendJavaScript("Chat.clean();");
};
});
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8d4e3e51/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
index 5ea12a5..50d582d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js
@@ -21,7 +21,9 @@ var Chat = function() {
, iconCloseRoom = 'ui-icon-caret-1-' + (isRtl ? 'w' : 'e')
;
let p, pp, ctrl, icon, tabs, openedHeight = "345px", openedWidth = "300px", allPrefix = "All"
- , roomPrefix = "Room ", typingTimer, audio, s, roomMode = false, globalWidth = 600;
+ , roomPrefix = "Room ", typingTimer, audio, s, roomMode = false, globalWidth = 600
+ , editor = $('#chatMessage .wysiwyg-editor')
+ ;
try {
audio = new Audio('./public/chat_message.mp3');
@@ -100,6 +102,7 @@ var Chat = function() {
pp = $('#chatPanel, #chatPopup');
ctrl = $('#chatPopup .control.block');
icon = $('#chatPopup .control.block .ui-icon');
+ editor = $('#chatMessage .wysiwyg-editor');
icon.removeClass(function(index, className) {
return (className.match (/(^|\s)ui-icon-caret-\S+/g) || []).join(' ');
});
@@ -312,8 +315,10 @@ var Chat = function() {
}
}
function _emtClick(emoticon) {
- const editor = $('#chatMessage .wysiwyg-editor');
- editor.html(editor.html() + ' ' + emoticon + ' ');
+ editor.html(editor.html() + ' ' + emoticon + ' ').trigger('change');
+ }
+ function _clean() {
+ editor.html('').trigger('change');
}
function _setRoomMode(_mode) {
roomMode = _mode;
@@ -342,6 +347,7 @@ var Chat = function() {
, emtClick: _emtClick
, setRoomMode: _setRoomMode
, setHeight: _setHeight
+ , clean: _clean
};
}();