Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(client): combine & prefer leave* transitions of from route 

#566
This commit is contained in:
Pooya Parsa 2017-06-12 04:58:03 +04:30
parent 6ca11461ce
commit 5c36ed7b73
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/app/client.js
View File

@ -14,12 +14,23 @@ let router
<%= (store ? 'let store' : '') %> <%= (store ? 'let store' : '') %>
function mapTransitions(Components, to, from) { function mapTransitions(Components, to, from) {
const resolve = t => (typeof t.options.transition === 'function')
? t.options.transition(to, from)
: Object.assign({}, t.options.transition)
const resolveRoute = r => resolve(r.matched[0].components.default)
return Components.map((Component) => { return Components.map((Component) => {
let transition = Component.options.transition let transitions = Object.assign({}, to ? resolveRoute(to) : resolve(Component))
if (typeof transition === 'function') { // Combine transitions
return transition(to, from) // Prefer leave* transitions of from route
} let from_transitions = from ? resolveRoute(from) : {}
return transition Object.keys(from_transitions).forEach(key=> {
if(from_transitions[key] && key.toLowerCase().indexOf('leave') !== -1) {
transitions[key] = from_transitions[key]
}
})
return transitions
}) })
} }