template parser: improve HTML entity regex (fix vuejs#1330)

yyx990803 · yyx990803 · commit 7ce035d99ddf · 2015-09-17T10:22:22.000-04:00
diff --git a/src/parsers/template.js b/src/parsers/template.js
@@ -70,7 +70,7 @@ function isRealTemplate (node) {
 }
 
 var tagRE = /<([\w:]+)/
-var entityRE = /&\w+;/
+var entityRE = /&\w+;|&#\d+;|&#x[\dA-F]+;/
 
 /**
  * Convert a string template to a DocumentFragment.
diff --git a/test/unit/specs/parsers/template_spec.js b/test/unit/specs/parsers/template_spec.js
@@ -42,6 +42,11 @@ if (_.inBrowser) {
       expect(res instanceof DocumentFragment).toBeTruthy()
       expect(res.childNodes.length).toBe(1)
       expect(res.firstChild.nodeValue).toBe('hi<hi')
+      // #1330
+      res = parse('hello &#x2F; hello')
+      expect(res instanceof DocumentFragment).toBeTruthy()
+      expect(res.childNodes.length).toBe(1)
+      expect(res.firstChild.nodeValue).toBe('hello / hello')
     })
 
     it('should parse textContent if argument is a script node', function () {

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ function isRealTemplate (node) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`var tagRE = /<([\w:]+)/`
`73`		`-var entityRE = /&\w+;/`
	`73`	`+var entityRE = /&\w+;\|&#\d+;\|&#x[\dA-F]+;/`
`74`	`74`
`75`	`75`	`/**`
`76`	`76`	`* Convert a string template to a DocumentFragment.`