Commit f13162dda2d55b451dcb1acc669c388c33c258dc
Committed by
GitHub
GitHub
Merge pull request #1690 from SergioCrisostomo/fix-#1687
Use textContent to not escape html entities in Select options
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
src/components/select/select.vue
| @@ -291,7 +291,7 @@ | @@ -291,7 +291,7 @@ | ||
| 291 | this.findChild((child) => { | 291 | this.findChild((child) => { |
| 292 | options.push({ | 292 | options.push({ |
| 293 | value: child.value, | 293 | value: child.value, |
| 294 | - label: (child.label === undefined) ? child.$el.innerHTML : child.label | 294 | + label: (child.label === undefined) ? child.$el.textContent : child.label |
| 295 | }); | 295 | }); |
| 296 | child.index = index++; | 296 | child.index = index++; |
| 297 | 297 |
test/unit/specs/select.spec.js
| @@ -56,7 +56,7 @@ describe('Select.vue', () => { | @@ -56,7 +56,7 @@ describe('Select.vue', () => { | ||
| 56 | }); | 56 | }); |
| 57 | }); | 57 | }); |
| 58 | 58 | ||
| 59 | - xit('should accept normal characters', done => { | 59 | + it('should accept normal characters', done => { |
| 60 | vm = createVue({ | 60 | vm = createVue({ |
| 61 | template: ` | 61 | template: ` |
| 62 | <Select :value="2"> | 62 | <Select :value="2"> |