Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/platforms/web/runtime/components/transition.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ function getRealChild (vnode: ?VNode): ?VNode {
}
}

function activeAttr (k: string): boolean {
// assuming active if undefined
return this[camelize(k)] === undefined || this[camelize(k)] === true
}

export function extractTransitionData (comp: Component): Object {
const data = {}
const options: ComponentOptions = comp.$options
Expand All @@ -49,9 +54,11 @@ export function extractTransitionData (comp: Component): Object {
}
// events.
// extract listeners and pass them directly to the transition methods
const listeners: ?Object = options._parentListeners
for (const key in listeners) {
data[camelize(key)] = listeners[key]
const listeners: Object = options._parentListeners || {}
// remove the listeners that are explicitily disabled
const listenerKeys: Array<string> = Object.keys(listeners).filter(activeAttr, data)
for (let i = 0; i < listenerKeys.length; i++) {
data[camelize(listenerKeys[i])] = listeners[listenerKeys[i]]
}
return data
}
Expand Down
24 changes: 24 additions & 0 deletions test/unit/features/transition/transition.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,30 @@ if (!isIE9) {
}).then(done)
})

it('appear: false', done => {
let next
const vm = new Vue({
template: `
<div>
<transition name="test" :appear="false" @appear="appear" >
<div v-if="ok" class="test">foo</div>
</transition>
</div>
`,
data: { ok: true },
methods: {
appear: (el, cb) => {
next = cb
}
}
}).$mount(el)

waitForUpdate(() => {
expect(vm.$el.children[0].className).toBe('test')
expect(next).toBeUndefined()
}).then(done)
})

it('transition on SVG elements', done => {
const vm = new Vue({
template: `
Expand Down