Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CoCo_Code_Op2
next.js
提交
242758e3
N
next.js
项目概览
CoCo_Code_Op2
/
next.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
N
next.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
242758e3
编写于
12月 28, 2016
作者:
N
Naoyuki Kanezawa
提交者:
Guillermo Rauch
12月 27, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix navigation failure (#546)
上级
0c6efce5
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
24 addition
and
29 deletion
+24
-29
lib/link.js
lib/link.js
+3
-6
lib/router/router.js
lib/router/router.js
+21
-23
未找到文件。
lib/link.js
浏览文件 @
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
浏览文件 @
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
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录