Merge pull request capricorn86#871 from btea/task/870-entities-convert

capricorn86#870@patch: Convert HTML entities should include semicolon.
lukasbach · Apr 21, 2023 · a3ae49d · a3ae49d
2 parents 606f33e + 42cf9bc
commit a3ae49d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/packages/happy-dom/src/nodes/character-data/CharacterDataUtility.ts b/packages/happy-dom/src/nodes/character-data/CharacterDataUtility.ts
@@ -2,23 +2,23 @@ import ICharacterData from './ICharacterData';
 
 const HTML_ENTITIES = [
 	{ regex: /&quot;/g, value: '"' },
-	{ regex: /&#34/g, value: '"' },
-	{ regex: /&#x22/g, value: '"' },
+	{ regex: /&#34;/g, value: '"' },
+	{ regex: /&#x22;/g, value: '"' },
 	{ regex: /&amp;/g, value: '&' },
-	{ regex: /&#38/g, value: '&' },
-	{ regex: /&#x26/g, value: '&' },
+	{ regex: /&#38;/g, value: '&' },
+	{ regex: /&#x26;/g, value: '&' },
 	{ regex: /&apos;/g, value: "'" },
-	{ regex: /&#39/g, value: "'" },
-	{ regex: /&#x27/g, value: "'" },
+	{ regex: /&#39;/g, value: "'" },
+	{ regex: /&#x27;/g, value: "'" },
 	{ regex: /&lt;/g, value: '<' },
-	{ regex: /&#60/g, value: '<' },
-	{ regex: /&#x3C/g, value: '<' },
+	{ regex: /&#60;/g, value: '<' },
+	{ regex: /&#x3C;/g, value: '<' },
 	{ regex: /&gt;/g, value: '>' },
-	{ regex: /&#62/g, value: '>' },
-	{ regex: /&#x3E/g, value: '>' },
+	{ regex: /&#62;/g, value: '>' },
+	{ regex: /&#x3E;/g, value: '>' },
 	{ regex: /&nbsp;/g, value: ' ' },
-	{ regex: /&#160/g, value: ' ' },
-	{ regex: /&#xA0/g, value: ' ' }
+	{ regex: /&#160;/g, value: ' ' },
+	{ regex: /&#xA0;/g, value: ' ' }
 ];
 
 /**

diff --git a/packages/happy-dom/test/nodes/element/Element.test.ts b/packages/happy-dom/test/nodes/element/Element.test.ts
@@ -142,6 +142,9 @@ describe('Element', () => {
 			const el2 = document.createElement('div');
 			el2.innerHTML = '<div id="testnode">&gt;&lt;&amp;&quot;&apos;&nbsp;&nbsp;</div>';
 			expect(el2.textContent).toBe('><&"\'  ');
+			const el3 = document.createElement('div');
+			el3.innerHTML = '&#x3C;div&#x3E;Hello, world!&#x3C;/div&#x3E;';
+			expect(el3.textContent).toBe('<div>Hello, world!</div>');
 		});
 	});