Skip to content

Commit 88ec994

Browse files
Improve emoji detection in containsEmoji function
1 parent 0573206 commit 88ec994

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

src/main/webapp/myAccount.jsp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,14 @@ java.io.*" %>
337337

338338
<script>
339339
function containsEmoji(text) {
340-
var emojiRegex = /[\u{1F600}-\u{1F64F}]|[\u{1F300}-\u{1F5FF}]|[\u{1F680}-\u{1F6FF}]|[\u{1F1E0}-\u{1F1FF}]|[\u{2600}-\u{26FF}]|[\u{2700}-\u{27BF}]|[\u{1F900}-\u{1F9FF}]|[\u{1FA70}-\u{1FAFF}]|[\u{FE00}-\u{FE0F}]|[\u{1F018}-\u{1F270}]|[\u{238C}-\u{2454}]|[\u{20D0}-\u{20FF}]/gu;
341-
return emojiRegex.test(text);
340+
try {
341+
var emojiRegex = /\p{Emoji}/gu;
342+
return emojiRegex.test(text);
343+
} catch (e) {
344+
// for older browsers that don't support \p{Emoji}
345+
var fallbackRegex = /[\u{1F600}-\u{1F64F}]|[\u{1F300}-\u{1F5FF}]|[\u{1F680}-\u{1F6FF}]|[\u{1F1E0}-\u{1F1FF}]|[\u{2600}-\u{26FF}]|[\u{2700}-\u{27BF}]|[\u{1F900}-\u{1F9FF}]|[\u{1FA70}-\u{1FAFF}]|[\u{FE00}-\u{FE0F}]|[\u{1F018}-\u{1F270}]|[\u{238C}-\u{2454}]|[\u{20D0}-\u{20FF}]/gu;
346+
return fallbackRegex.test(text);
347+
}
342348
}
343349
344350
function sendButtonClicked() {

0 commit comments

Comments
 (0)