Fixing error on multiple keyword highlight

mtlynch · Nov 13, 2017 · 3360f3b · 3360f3b
1 parent 3dc9997
commit 3360f3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/app/_pipes/highlighted-result/highlighted-result.pipe.spec.ts b/src/app/_pipes/highlighted-result/highlighted-result.pipe.spec.ts
@@ -19,6 +19,10 @@ describe('HighlightedResultPipe', () => {
     expect(pipe.transform('scams and flams', 'ams')).toBe('sc<mark>ams</mark> and fl<mark>ams</mark>');
   });
 
+  it('should match multiple keywords', () => {
+    expect(pipe.transform('spam and eggs', 'spam eggs')).toBe('<mark>spam</mark> and <mark>eggs</mark>');
+  });
+
   it('should coalesce adjacent matches', () => {
     expect(pipe.transform('jeeepers', 'e')).toBe('j<mark>eee</mark>p<mark>e</mark>rs');
   });

diff --git a/src/app/_pipes/highlighted-result/highlighted-result.pipe.ts b/src/app/_pipes/highlighted-result/highlighted-result.pipe.ts
@@ -11,7 +11,7 @@ export class HighlightedResultPipe implements PipeTransform {
     if (keywords && highlightedValue) {
       for (const keyword of keywords.split(' ')) {
         let startIndex = 0;
-        startIndex = value.toLowerCase().indexOf(keyword.toLowerCase());
+        startIndex = highlightedValue.toLowerCase().indexOf(keyword.toLowerCase());
         while (startIndex !== -1) {
           const endLength = keyword.length;
           const matchingString = highlightedValue.substr(startIndex, endLength);