Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-06 21:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: transition property beeing a function

Browse Source
This commit is contained in:
Sébastien Chopin 2017-06-19 23:30:05 +02:00
parent b6d82a7c5b
commit 664ce12662
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/app/client.js
View File

@ -14,20 +14,21 @@ let router
<%= (store ? 'let store' : '') %> <%= (store ? 'let store' : '') %>
function mapTransitions(Components, to, from) { function mapTransitions(Components, to, from) {
function componentTransitions(component) { const componentTransitions = (component) => {
if (!component || !component.options || !component.options.transition) { if (!component || !component.options || !component.options.transition) {
return {} return {}
} }
if(typeof component.options.transition === 'function') { let transition = component.options.transition
return component.options.transition(to, from) if (typeof transition === 'function') {
transition = transition(to, from)
} }
return component.options.transition return (typeof transition === 'string' ? { name: transition } : transition)
} }
return Components.map((Component) => { return Components.map((Component) => {
// Clone original object to prevent overrides // Clone original object to prevent overrides
const transitions = Object.assign({}, componentTransitions(Component)) const transitions = Object.assign({}, componentTransitions(Component))
// Combine transitions & prefer *leave* transitions of 'from' route // Combine transitions & prefer `leave` transitions of 'from' route
if(from && from.matched.length && from.matched[0].components.default) { if (from && from.matched.length && from.matched[0].components.default) {
const from_transitions = componentTransitions(from.matched[0].components.default) const from_transitions = componentTransitions(from.matched[0].components.default)
Object.keys(from_transitions) Object.keys(from_transitions)
.filter(key => from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) .filter(key => from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1)