11/**
2- * Vue.js v0.11.2
2+ * Vue.js v0.11.3
33 * (c) 2014 Evan You
44 * Released under the MIT License.
55 */
@@ -1628,6 +1628,7 @@ return /******/ (function(modules) { // webpackBootstrap
16281628
16291629 exports . _compile = function ( el ) {
16301630 var options = this . $options
1631+ var parent = options . _parent
16311632 if ( options . _linkFn ) {
16321633 this . _initElement ( el )
16331634 options . _linkFn ( this , el )
@@ -1637,20 +1638,26 @@ return /******/ (function(modules) { // webpackBootstrap
16371638 // separate container element and content
16381639 var content = options . _content = _ . extractContent ( raw )
16391640 // create two separate linekrs for container and content
1641+ var parentOptions = parent . $options
1642+
1643+ // hack: we need to skip the paramAttributes for this
1644+ // child instance when compiling its parent container
1645+ // linker. there could be a better way to do this.
1646+ parentOptions . _skipAttrs = options . paramAttributes
16401647 var containerLinkFn =
1641- compile ( raw , options , true , true )
1648+ compile ( raw , parentOptions , true , true )
1649+ parentOptions . _skipAttrs = null
1650+
16421651 if ( content ) {
16431652 var contentLinkFn =
1644- compile ( content , options , true , true )
1653+ compile ( content , parentOptions , true )
16451654 // call content linker now, before transclusion
1646- this . _contentUnlinkFn =
1647- contentLinkFn ( options . _parent , content )
1655+ this . _contentUnlinkFn = contentLinkFn ( parent , content )
16481656 }
16491657 // tranclude, this possibly replaces original
16501658 el = transclude ( el , options )
16511659 // now call the container linker on the resolved el
1652- this . _containerUnlinkFn =
1653- containerLinkFn ( options . _parent , el )
1660+ this . _containerUnlinkFn = containerLinkFn ( parent , el )
16541661 } else {
16551662 // simply transclude
16561663 el = transclude ( el , options )
@@ -4612,7 +4619,8 @@ return /******/ (function(modules) { // webpackBootstrap
46124619 * @param {Element|DocumentFragment } el
46134620 * @param {Object } options
46144621 * @param {Boolean } partial
4615- * @param {Boolean } asParent
4622+ * @param {Boolean } asParent - compiling a component
4623+ * container as its parent.
46164624 * @return {Function }
46174625 */
46184626
@@ -5102,6 +5110,10 @@ return /******/ (function(modules) { // webpackBootstrap
51025110 */
51035111
51045112 function collectAttrDirective ( el , name , value , options ) {
5113+ if ( options . _skipAttrs &&
5114+ options . _skipAttrs . indexOf ( name ) > - 1 ) {
5115+ return
5116+ }
51055117 var tokens = textParser . parse ( value )
51065118 if ( tokens ) {
51075119 var def = options . directives . attr
0 commit comments