transclude class merging should skip interpolated class (fix vuejs#2085)

xyf1215 · Dec 25, 2015 · cdf233f · cdf233f
1 parent da9e036
commit cdf233f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/compiler/transclude.js b/src/compiler/transclude.js
@@ -1,4 +1,5 @@
 import { parseTemplate } from '../parsers/template'
+import { parseText } from '../parsers/text'
 import {
  warn,
  isTemplate,
@@ -149,7 +150,7 @@ function mergeAttrs (from, to) {
  value = attrs[i].value
  if (!to.hasAttribute(name) && !specialCharRE.test(name)) {
  to.setAttribute(name, value)
- } else if (name === 'class') {
+ } else if (name === 'class' && !parseText(value)) {
  value.split(/\s+/).forEach(function (cls) {
  addClass(to, cls)
  })

diff --git a/test/unit/specs/misc_spec.js b/test/unit/specs/misc_spec.js
@@ -428,4 +428,21 @@ describe('Misc', function () {
  })
  expect(vm.$el.firstChild.className).toBe('hi test-transition')
  })
+
+ it('transclude class merging should skip interpolated class', function () {
+ var vm = new Vue({
+ el: document.createElement('div'),
+ template: '<test class="outer-{{test}}"></test>',
+ data: {
+ test: 'hi'
+ },
+ components: {
+ test: {
+ template: '<div class="inner"></div>',
+ replace: true
+ }
+ }
+ })
+ expect(vm.$el.firstChild.className).toBe('outer-hi')
+ })
 })