Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

improve 'AlreadyHere' event #94

Merged
merged 3 commits into from
Nov 18, 2014
Merged
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
35 changes: 19 additions & 16 deletions src/core/router.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ module.exports = class KDRouter extends KDObject
userRoute = userRoute.slice 1 if (userRoute.indexOf '!') is 0
@visitedRoutes.push userRoute if @visitedRoutes.last isnt userRoute

[frag, query...] = (userRoute ? @getDefaultRoute?() ? '/').split '?'
[frags, query...] = (userRoute ? @getDefaultRoute?() ? '/').split '?'

query = @utils.parseQuery query.join '&'

Expand All @@ -127,36 +127,39 @@ module.exports = class KDRouter extends KDObject
node = @tree
params = {}

frag = frag.split '/'
frag.shift() # first edge is garbage like '' or '#!'
frags = frags.split '/'
frags.shift() # first edge is garbage like '' or '#!'

frag = frag.filter Boolean
frags = frags.filter Boolean

path = "/#{frag.join '/'}"
path = "/#{frags.join '/'}"

qs = @utils.stringifyQuery query
path += "?#{qs}" if qs.length

notFound = no
for edge in frags
if node[edge]
node = node[edge]
else
param = node[':']
if param?
params[param.name] = edge
node = param
else notFound = yes

if not suppressListeners and shouldPushState and not replaceState and path is @currentPath
@emit 'AlreadyHere', path
@emit 'AlreadyHere', path, { params, frags }
return

@handleNotFound frags.join '/' if notFound

@currentPath = path

if shouldPushState
method = if replaceState then 'replaceState' else 'pushState'
history[method] objRef, path, path

for edge in frag
if node[edge]
node = node[edge]
else
param = node[':']
if param?
params[param.name] = edge
node = param
else @handleNotFound frag.join '/'

routeInfo = {params, query}
@emit 'RouteInfoHandled', {params, query, path}

Expand Down