Fix bug in <content> select.

Fallback wasn't used when none of the nodes matched by the selector
were children of the target.

refs vuejs#786

Author: nkovacs

src/compiler/transclude.js

@@ -88,12 +88,13 @@ function transcludeContent (el, raw) {
       if (select) {  // select content
         selected = raw.querySelectorAll(select)
         if (selected.length) {
-          outlet.content = _.toArray(selected).filter(function(element) {
-            return element.parentNode === raw
+          selected = _.toArray(selected).filter(function(node) {
+            return node.parentNode === raw
           })
-        } else {
-          outlet.content = _.toArray(outlet.childNodes)
         }
+        outlet.content = selected.length
+          ? selected
+          : _.toArray(outlet.childNodes)
       } else { // default content
         main = outlet
       }

test/unit/specs/compiler/transclude_spec.js

@@ -110,12 +110,13 @@ if (_.inBrowser) {
     })
 
     it('select should only match children', function () {
-      el.innerHTML = '<p class="b">select b</p><span><p class="b">nested b</p></span>'
-      options.template = '<content select=".a"><p>fallback a</p></content><content select=".b">fallback b</content>'
+      el.innerHTML = '<p class="b">select b</p><span><p class="b">nested b</p></span><span><p class="c">nested c</p></span>'
+      options.template = '<content select=".a"><p>fallback a</p></content><content select=".b">fallback b</content><content select=".c">fallback c</content>'
       var res = transclude(el, options)
-      expect(res.childNodes.length).toBe(2)
+      expect(res.childNodes.length).toBe(3)
       expect(res.firstChild.textContent).toBe('fallback a')
-      expect(res.lastChild.textContent).toBe('select b')
+      expect(res.childNodes[1].textContent).toBe('select b')
+      expect(res.lastChild.textContent).toBe('fallback c')
     })
 
   })