From d7b206cc9325e4cc7b460bf5bfc218ad2b304fc1 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 16 Sep 2014 16:01:38 +0100
Subject: Added basic RegExp support.

---
 webclient/components/matrix/event-handler-service.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'webclient/components')

diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 72859eae3e..0c7c0d1696 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -74,10 +74,8 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
         // bing word list check
         if (bingWords && !shouldBing) {
             for (var i=0; i<bingWords.length; i++) {
-                // TODO: Should really be a word check, not a string of characters check.
-                // E.g. bing word is "coffee", "I have coffee" = bing, "I am a coffeepot" = no bing
-                // Currently it will bing for both.
-                if (content.indexOf(bingWords[i]) != -1) {
+                var re = RegExp(bingWords[i]);
+                if (content.search(re) != -1) {
                     shouldBing = true;
                     break;
                 }
-- 
cgit 1.5.1