yyx990803 · yyx990803 · commit 7628105dc6e5 · 2014-02-18T11:37:18.000-05:00
diff --git a/src/compiler.js b/src/compiler.js
@@ -116,6 +116,7 @@ function Compiler (vm, options) {
     compiler.parseDeps()
 
     // done!
+    compiler.rawContent = null
     compiler.init = false
 
     // post compile / ready hook
@@ -136,6 +137,13 @@ CompilerProto.setupElement = function (options) {
 
     var template = options.template
     if (template) {
+        // collect anything already in there
+        /* jshint boss: true */
+        var child,
+            frag = this.rawContent = document.createDocumentFragment()
+        while (child = el.firstChild) {
+            frag.appendChild(child)
+        }
         // replace option: use the first node in
         // the template directly
         if (options.replace && template.childNodes.length === 1) {
@@ -146,7 +154,6 @@ CompilerProto.setupElement = function (options) {
             }
             el = replacer
         } else {
-            el.innerHTML = ''
             el.appendChild(template.cloneNode(true))
         }
     }
@@ -415,9 +422,18 @@ CompilerProto.compileTextNode = function (node) {
         if (token.key) { // a binding
             if (token.key.charAt(0) === '>') { // a partial
                 partialId = token.key.slice(1).trim()
-                partial = this.getOption('partials', partialId)
-                if (partial) {
-                    el = partial.cloneNode(true)
+                if (partialId === 'yield') {
+                    el = this.rawContent
+                } else {
+                    partial = this.getOption('partials', partialId)
+                    if (partial) {
+                        el = partial.cloneNode(true)
+                    } else {
+                        utils.warn('Unknown partial: ' + partialId)
+                        continue
+                    }
+                }
+                if (el) {
                     // save an Array reference of the partial's nodes
                     // so we can compile them AFTER appending the fragment
                     partialNodes = slice.call(el.childNodes)
diff --git a/test/functional/fixtures/template.html b/test/functional/fixtures/template.html
@@ -3,6 +3,7 @@
 <div id="usa" v-partial="global"></div>
 <div id="japan">{{> local}}</div>
 <div id="repeat">{{> repeat}}</div>
+<div id="yielder"><yielder><p>{{a}}</p><p>{{b}}</p></yielder></div>
 
 <script type="text/v-template" id="test">
     <p>{{hi}}!</p>
@@ -12,6 +13,10 @@
     <p v-repeat="items">{{title}}</p>
 </script>
 
+<script type="text/v-template" id="yield-template">
+    <h1>before</h1>{{>yield}}<h2>after</h2>
+</script>
+
 <script src="../../../dist/vue.js"></script>
 <script>
 
@@ -61,4 +66,13 @@
             items: [{ title: 'Repeat' }]
         }
     })
+
+    Vue.component('yielder', {
+        template: '#yield-template',
+        data: {
+            a: 'A', b: 'B'
+        }
+    })
+
+    new Vue({el:'#yielder'})
 </script>
diff --git a/test/functional/specs/template.js b/test/functional/specs/template.js
@@ -1,4 +1,4 @@
-casper.test.begin('Templates and Partials', 5, function (test) {
+casper.test.begin('Templates and Partials', 6, function (test) {
     
     casper
     .start('./fixtures/template.html')
@@ -8,6 +8,9 @@ casper.test.begin('Templates and Partials', 5, function (test) {
         test.assertSelectorHasText('#china', '你好', 'direct option')
         test.assertSelectorHasText('#hawaii', 'Aloha', 'extend option')
         test.assertSelectorHasText('#repeat', 'Repeat', 'inline partial with repeat')
+        test.assertEvalEquals(function () {
+            return document.querySelector('#yielder').innerHTML
+        }, '<yielder><h1>before</h1><p>A</p><p>B</p><h2>after</h2></yielder>')
     })
     .run(function () {
         test.done()
