tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Added basic RegExp support.

Browse source
This commit is contained in:
Kegan Dougal 2014-09-16 16:01:38 +01:00
parent 06dfbdf7c8
commit d7b206cc93
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webclient/components/matrix/event-handler-service.js
View file

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

2
webclient/settings/settings.html
View file

@ -55,7 +55,7 @@
<div class="section"> <div class="section">
<h4>Additional words to alert on:</h4> <h4>Additional words to alert on:</h4>
<p>Leave blank to alert on all messages.</p> <p>Leave blank to alert on all messages.</p>
<input size=40 name="bingWords" ng-model="settings.bingWords" ng-list placeholder="Enter case-sensitive words separated with ," <input size=40 name="bingWords" ng-model="settings.bingWords" ng-list placeholder="Enter words separated with , (supports regex)"
ng-blur="saveBingWords()"/> ng-blur="saveBingWords()"/>
<ul> <ul>
<li ng-repeat="word in settings.bingWords">{{word}}</li> <li ng-repeat="word in settings.bingWords">{{word}}</li>