Merge pull request #2647 from fduraibi/patch-23

Fix for word highlighting of none Latin characters
9 years ago · 9fe4e49c1a
parent dd2549dbe5 afe3176c89
commit 9fe4e49c1a
1 changed files with 1 additions and 1 deletions
--- a/packages/rocketchat-highlight-words/client.coffee
+++ b/packages/rocketchat-highlight-words/client.coffee
@ -17,7 +17,7 @@ class HighlightWordsClient
    _.forEach to_highlight, (highlight) ->
      if not _.isBlank(highlight)
-        msg = msg.replace(new RegExp("(\\b)(#{s.escapeRegExp(highlight)})(\\b)(?![^<]*>|[^<>]*<\\/)", 'gmi'), '$1<span class="highlight-text">$2</span>$3')
+        msg = msg.replace(new RegExp("(^|\\b|[\\s\\n\\r\\t.,،'\\\"\\+!?:-])(#{s.escapeRegExp(highlight)})($|\\b|[\\s\\n\\r\\t.,،'\\\"\\+!?:-])(?![^<]*>|[^<>]*<\\/)", 'gmi'), '$1<span class="highlight-text">$2</span>$3')
    message.html = msg
    return message