Commit f28260a

simplesmileryyx990803

authored and

committed

Fix handling v-if along with v-for on a template tag (#2663)

* Fix handling multiple directives on a template tag * Use a simpler check

1 parent 219b80b commit f28260aCopy full SHA for f28260a

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export default function FragmentFactory (vm, el) {`
`18`	`18`	`this.vm = vm`
`19`	`19`	`var template`
`20`	`20`	`var isString = typeof el === 'string'`
`21`		`- if (isString \|\| isTemplate(el)) {`
	`21`	`+ if (isString \|\| isTemplate(el)&&!el.hasAttribute('v-if')) {`
`22`	`22`	`template = parseTemplate(el, true)`
`23`	`23`	`} else {`
`24`	`24`	`template = document.createDocumentFragment()`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -537,4 +537,13 @@ describe('Misc', function () {`
`537`	`537`	`})`
`538`	`538`	`expect(vm.$el.querySelector('image-field').namespaceURI).not.toMatch(/svg/)`
`539`	`539`	`})`
	`540`	`+`
	`541`	`+ // #2657`
	`542`	`+ it('template v-for with v-if', function () {`
	`543`	`+ var vm = new Vue({`
	`544`	`+ el: document.createElement('div'),`
	`545`	`+ template: '<div><template v-for="n in 6" v-if="n % 2">{{ n }}</template></div>'`
	`546`	`+ })`
	`547`	`+ expect(vm.$el.textContent).toBe('135')`
	`548`	`+ })`
`540`	`549`	`})`

Comments

(0)