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 2018/02/08 03:59:29 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1820] crying
emoji is fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new d16bf42 [OPENMEETINGS-1820] crying emoji is fixed
d16bf42 is described below
commit d16bf4285edde47c7bbf8df85fad108bd0d91196
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Feb 8 10:59:20 2018 +0700
[OPENMEETINGS-1820] crying emoji is fixed
---
.../main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js
index f7f8542..948b8e7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js
@@ -64,6 +64,11 @@ var CSSEmoticon = function() {
m.text = m.text.replace(/=/g, '=').replace(/[+]/g, '+');
self.matchers.push(createMatcher(m));
}
+ if (m.text.indexOf('\'') > -1) {
+ m = JSON.parse(JSON.stringify(m));
+ m.text = m.text.replace(/'/g, ''');
+ self.matchers.push(createMatcher(m));
+ }
}
}
addMatchers([
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.