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

Merge branch 'master' into feature-layout

This commit is contained in:
Sébastien Chopin 2016-12-23 17:32:11 +01:00
parent 7148502e37 2fff5e7a4f
commit 854573a7ad
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/build/index.js
View File

@ -211,11 +211,12 @@ function createRoutes (files, srcDir) {
}) })
route._name = '_' + hash(route.component) route._name = '_' + hash(route.component)
// Order Routes path // Order Routes path
if (_.last(keys)[0] === '_') { parent.push(route)
parent.push(route) parent.sort((a, b) => {
} else { var isA = (a.path[0] === ':' || a.path[1] === ':') ? 1 : 0
parent.unshift(route) var isB = (b.path[0] === ':' || b.path[1] === ':') ? 1 : 0
} return (isA - isB === 0) ? a.path.length - b.path.length : isA - isB
})
}) })
return cleanChildrenRoutes(routes) return cleanChildrenRoutes(routes)
} }