Fix highligthing multiple word. Closes #151 (#155)

mthenw · Jan 9, 2019 · 57367a2 · 57367a2
1 parent 26c3957
commit 57367a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/test/app.js b/test/app.js
@@ -121,13 +121,16 @@ describe('browser application', () => {
   it('should highlight word', () => {
     io.emit('options:highlightConfig', {
       words: {
-        line: 'background: black'
+        foo: 'background: black',
+        bar: 'background: black'
       }
     });
-    io.emit('line', 'line1');
+    io.emit('line', 'foo bar');
 
     const line = window.document.querySelector('.line');
-    line.innerHTML.should.containEql('<span style="background: black">line</span>');
+    line.innerHTML.should.containEql(
+      '<span style="background: black">foo</span> <span style="background: black">bar</span>'
+    );
   });
 
   it('should highlight line', () => {

diff --git a/web/assets/app.js b/web/assets/app.js
@@ -177,7 +177,7 @@ window.App = (function app(window, document) {
 
     if (_highlightConfig && _highlightConfig.words) {
       Object.keys(_highlightConfig.words).forEach((wordCheck) => {
-        output = line.replace(
+        output = output.replace(
           wordCheck,
           '<span style="' + _highlightConfig.words[wordCheck] + '">' + wordCheck + '</span>'
         );