🔥 Remove old escapeHTML function

Author: richardfrost

src/script/lib/helper.ts

@@ -11,18 +11,6 @@ export function dynamicList(list: string[], select: HTMLSelectElement, title?: s
   });
 }
 
-export function escapeHTML(str: string): string {
-  return str.replace(/([<>&"'])/g, (match, p1) => (
-    {
-      '<': '&lt;',
-      '>': '&gt;',
-      '&': '&amp;',
-      '"': '&quot;',
-      "'": '&apos;'
-    }[p1])
-  );
-}
-
 export function exportToFile(dataStr, fileName = 'data.txt') {
   const dataUri = 'data:application/json;charset=utf-8,'+ encodeURIComponent(dataStr);
   const linkElement = document.createElement('a');

src/script/optionPage.ts

@@ -1,5 +1,5 @@
 import Constants from './lib/constants';
-import { dynamicList, escapeHTML, exportToFile, readFile, removeChildren, removeFromArray } from './lib/helper';
+import { dynamicList, exportToFile, readFile, removeChildren, removeFromArray } from './lib/helper';
 import WebConfig from './webConfig';
 import Filter from './lib/filter';
 import Domain from './domain';
@@ -743,7 +743,7 @@ export default class OptionPage {
       const optionElement = document.createElement('option');
       optionElement.value = item === list[0] ? '' : item.replace(regExp, '');
       optionElement.dataset.sensitive = regExp.test(item).toString();
-      optionElement.textContent = escapeHTML(item);
+      optionElement.textContent = item;
       whitelist.appendChild(optionElement);
     });
     this.populateWhitelistWord();
@@ -887,7 +887,7 @@ export default class OptionPage {
       const optionElement = document.createElement('option');
       optionElement.value = word === words[0] ? '' : word;
       optionElement.dataset.filtered = filteredWord;
-      optionElement.textContent = escapeHTML(filteredWord);
+      optionElement.textContent = filteredWord;
       wordsSelect.appendChild(optionElement);
     });
 

src/script/popup.ts

@@ -1,5 +1,5 @@
 import Constants from './lib/constants';
-import { dynamicList, escapeHTML } from './lib/helper';
+import { dynamicList } from './lib/helper';
 import WebAudioSites from './webAudioSites';
 import WebConfig from './webConfig';
 import Domain from './domain';
@@ -167,9 +167,9 @@ class Popup {
         tooltipSpan.classList.add('summaryTooltip');
         tooltipSpan.classList.add('w3-tag');
         tooltipSpan.classList.add('w3-text');
-        tooltipSpan.textContent = escapeHTML(key);
+        tooltipSpan.textContent = key;
         const wordSpan = document.createElement('span');
-        wordSpan.textContent = escapeHTML(summary[key].filtered);
+        wordSpan.textContent = summary[key].filtered;
         wordCell.appendChild(tooltipSpan);
         wordCell.appendChild(wordSpan);
 

test/lib/helper.spec.js

@@ -1,17 +1,9 @@
 import { expect } from 'chai';
-import { escapeHTML, formatNumber, getVersion, hmsToSeconds, isVersionOlder, removeFromArray, secondsToHMS } from '../built/lib/helper';
+import { formatNumber, getVersion, hmsToSeconds, isVersionOlder, removeFromArray, secondsToHMS } from '../built/lib/helper';
 
 const array = ['a', 'needle', 'in', 'a', 'large', 'haystack'];
 
 describe('Helper', function() {
-  describe('escapeHTML()', function() {
-    it('should return HTML safe string', function() {
-      expect(escapeHTML('a>b')).to.eql('a>b');
-      expect(escapeHTML('(?<!un)censored')).to.eql('(?&lt;!un)censored');
-      expect(escapeHTML('already safe')).to.eql('already safe');
-    });
-  });
-
   describe('formatNumber()', function() {
     it('Format numbers for counter display', function() {
       expect(formatNumber(999)).to.eql('999');