Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
242758e3
Commit
242758e3
authored
Dec 28, 2016
by
Naoyuki Kanezawa
Committed by
Guillermo Rauch
Dec 28, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix navigation failure (#546)
parent
0c6efce5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
29 deletions
+24
-29
link.js
lib/link.js
+3
-6
router.js
lib/router/router.js
+21
-23
No files found.
lib/link.js
View file @
242758e3
...
...
@@ -14,7 +14,7 @@ export default class Link extends Component {
return
}
const
{
href
,
as
}
=
this
.
props
const
{
href
,
as
=
href
}
=
this
.
props
if
(
!
isLocal
(
href
))
{
// ignore click if it's outside our scope
...
...
@@ -23,17 +23,14 @@ export default class Link extends Component {
e
.
preventDefault
()
const
route
=
as
?
href
:
null
const
url
=
as
||
href
// avoid scroll for urls with anchor refs
let
{
scroll
}
=
this
.
props
if
(
scroll
==
null
)
{
scroll
=
url
.
indexOf
(
'#'
)
<
0
scroll
=
as
.
indexOf
(
'#'
)
<
0
}
// straight up redirect
Router
.
push
(
route
,
url
)
Router
.
push
(
href
,
as
)
.
then
((
success
)
=>
{
if
(
!
success
)
return
if
(
scroll
)
window
.
scrollTo
(
0
,
0
)
...
...
lib/router/router.js
View file @
242758e3
...
...
@@ -29,9 +29,10 @@ export default class Router {
onPopState
(
e
)
{
this
.
abortComponentLoad
()
let
{
route
}
=
e
.
state
||
{}
const
{
pathname
,
query
}
=
parse
(
route
||
window
.
location
.
href
,
true
)
if
(
!
route
)
route
=
toRoute
(
pathname
)
const
as
=
getURL
()
const
{
url
=
as
}
=
e
.
state
||
{}
const
{
pathname
,
query
}
=
parse
(
url
,
true
)
const
route
=
toRoute
(
pathname
)
Promise
.
resolve
()
.
then
(
async
()
=>
{
...
...
@@ -40,7 +41,7 @@ export default class Router {
const
props
=
await
this
.
getInitialProps
(
data
.
Component
,
ctx
)
this
.
route
=
route
this
.
set
(
getURL
()
,
{
...
data
,
props
})
this
.
set
(
pathname
,
query
,
{
...
data
,
props
})
})
.
catch
(
async
(
err
)
=>
{
if
(
err
.
cancelled
)
return
...
...
@@ -50,7 +51,7 @@ export default class Router {
const
props
=
await
this
.
getInitialProps
(
data
.
Component
,
ctx
)
this
.
route
=
route
this
.
set
(
getURL
()
,
{
...
data
,
props
})
this
.
set
(
pathname
,
query
,
{
...
data
,
props
})
console
.
error
(
err
)
})
.
catch
((
err
)
=>
{
...
...
@@ -102,18 +103,17 @@ export default class Router {
window
.
history
.
back
()
}
push
(
route
,
url
=
route
)
{
return
this
.
change
(
'pushState'
,
route
,
url
)
push
(
url
,
as
=
url
)
{
return
this
.
change
(
'pushState'
,
url
,
as
)
}
replace
(
route
,
url
=
route
)
{
return
this
.
change
(
'replaceState'
,
route
,
url
)
replace
(
url
,
as
=
url
)
{
return
this
.
change
(
'replaceState'
,
url
,
as
)
}
async
change
(
method
,
route
,
url
)
{
const
{
pathname
,
query
}
=
parse
(
route
||
url
,
true
)
if
(
!
route
)
route
=
toRoute
(
pathname
)
async
change
(
method
,
url
,
as
)
{
const
{
pathname
,
query
}
=
parse
(
url
,
true
)
const
route
=
toRoute
(
pathname
)
this
.
abortComponentLoad
()
...
...
@@ -135,29 +135,27 @@ export default class Router {
console
.
error
(
err
)
}
if
(
method
!==
'pushState'
||
getURL
()
!==
url
)
{
window
.
history
[
method
]({
route
},
null
,
url
)
if
(
method
!==
'pushState'
||
getURL
()
!==
as
)
{
window
.
history
[
method
]({
url
},
null
,
as
)
}
this
.
route
=
route
this
.
set
(
url
,
{
...
data
,
props
})
this
.
set
(
pathname
,
query
,
{
...
data
,
props
})
if
(
_err
)
throw
_err
return
true
}
set
(
url
,
data
)
{
const
parsed
=
parse
(
url
,
true
)
if
(
this
.
urlIsNew
(
parsed
))
{
this
.
pathname
=
parsed
.
pathname
this
.
query
=
parsed
.
query
set
(
pathname
,
query
,
data
)
{
if
(
this
.
urlIsNew
(
pathname
,
query
))
{
this
.
pathname
=
pathname
this
.
query
=
query
this
.
notify
(
data
)
}
}
urlIsNew
(
{
pathname
,
query
}
)
{
urlIsNew
(
pathname
,
query
)
{
return
this
.
pathname
!==
pathname
||
!
shallowEquals
(
query
,
this
.
query
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment