fallback for slot with v-if should be compiled in child scope (fix vuejs#2348)

yyx990803 · yyx990803 · commit 9aef0f72ea54 · 2016-02-15T12:41:59.000-05:00
diff --git a/src/directives/element/slot.js b/src/directives/element/slot.js
@@ -73,6 +73,8 @@ export const slot = {
         const elseBlock = document.createElement('template')
         elseBlock.setAttribute('v-else', '')
         elseBlock.innerHTML = this.el.innerHTML
+        // the else block should be compiled in child scope
+        elseBlock._context = this.vm
         content.appendChild(elseBlock)
       }
       const scope = host
diff --git a/src/directives/public/if.js b/src/directives/public/if.js
@@ -19,7 +19,7 @@ export default {
       var next = el.nextElementSibling
       if (next && getAttr(next, 'v-else') !== null) {
         remove(next)
-        this.elseFactory = new FragmentFactory(this.vm, next)
+        this.elseFactory = new FragmentFactory(next._context || this.vm, next)
       }
       // check main block
       this.anchor = createAnchor('v-if')
diff --git a/test/unit/specs/directives/element/slot_spec.js b/test/unit/specs/directives/element/slot_spec.js
@@ -401,12 +401,16 @@ describe('Slot Distribution', function () {
     var vm = new Vue({
       el: el,
       data: {
-        ok: false
+        ok: false,
+        msg: 'inserted'
       },
-      template: '<div><comp><div v-if="ok">inserted</div></comp></div>',
+      template: '<div><comp><div v-if="ok">{{ msg }}</div></comp></div>',
       components: {
         comp: {
-          template: '<div><slot>fallback</slot></div>'
+          data: function () {
+            return { msg: 'fallback' }
+          },
+          template: '<div><slot>{{ msg }}</slot></div>'
         }
       }
     })

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ export const slot = {`
`73`	`73`	`const elseBlock = document.createElement('template')`
`74`	`74`	`elseBlock.setAttribute('v-else', '')`
`75`	`75`	`elseBlock.innerHTML = this.el.innerHTML`
	`76`	`+ // the else block should be compiled in child scope`
	`77`	`+ elseBlock._context = this.vm`
`76`	`78`	`content.appendChild(elseBlock)`
`77`	`79`	`}`
`78`	`80`	`const scope = host`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export default {`
`19`	`19`	`var next = el.nextElementSibling`
`20`	`20`	`if (next && getAttr(next, 'v-else') !== null) {`
`21`	`21`	`remove(next)`
`22`		`- this.elseFactory = new FragmentFactory(this.vm, next)`
	`22`	`+ this.elseFactory = new FragmentFactory(next._context \|\| this.vm, next)`
`23`	`23`	`}`
`24`	`24`	`// check main block`
`25`	`25`	`this.anchor = createAnchor('v-if')`