Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2aaa0222
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2aaa0222
编写于
4月 05, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed delayed update viewer
fixed `key` not being set to correct value
上级
b61aa6f8
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
6 addition
and
6 deletion
+6
-6
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+1
-1
app/assets/javascripts/ide/stores/modules/commit/getters.js
app/assets/javascripts/ide/stores/modules/commit/getters.js
+3
-3
app/assets/javascripts/ide/stores/mutations/file.js
app/assets/javascripts/ide/stores/mutations/file.js
+1
-0
app/assets/javascripts/ide/stores/utils.js
app/assets/javascripts/ide/stores/utils.js
+1
-2
未找到文件。
app/assets/javascripts/ide/components/repo_editor.vue
浏览文件 @
2aaa0222
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
})
})
.
then
(()
=>
{
.
then
(()
=>
{
const
viewerPromise
=
this
.
delayViewerUpdated
const
viewerPromise
=
this
.
delayViewerUpdated
?
this
.
updateViewer
(
'
editor
'
)
?
this
.
updateViewer
(
this
.
file
.
pending
?
'
diff
'
:
'
editor
'
)
:
Promise
.
resolve
();
:
Promise
.
resolve
();
return
viewerPromise
;
return
viewerPromise
;
...
...
app/assets/javascripts/ide/stores/modules/commit/getters.js
浏览文件 @
2aaa0222
...
@@ -7,9 +7,9 @@ export const commitButtonDisabled = (state, getters, rootState) =>
...
@@ -7,9 +7,9 @@ export const commitButtonDisabled = (state, getters, rootState) =>
getters
.
discardDraftButtonDisabled
||
!
rootState
.
stagedFiles
.
length
;
getters
.
discardDraftButtonDisabled
||
!
rootState
.
stagedFiles
.
length
;
export
const
newBranchName
=
(
state
,
_
,
rootState
)
=>
export
const
newBranchName
=
(
state
,
_
,
rootState
)
=>
`
${
gon
.
current_username
}
-
${
`
${
gon
.
current_username
}
-
${
rootState
.
currentBranchId
}
-patch-
${
`
${
new
Date
().
getTime
()}
`
.
substr
(
rootState
.
currentBranchId
-
5
,
}
-patch-
${
`
${
new
Date
().
getTime
()}
`
.
substr
(
-
5
)}
`
;
)}
`
;
export
const
branchName
=
(
state
,
getters
,
rootState
)
=>
{
export
const
branchName
=
(
state
,
getters
,
rootState
)
=>
{
if
(
if
(
...
...
app/assets/javascripts/ide/stores/mutations/file.js
浏览文件 @
2aaa0222
...
@@ -131,6 +131,7 @@ export default {
...
@@ -131,6 +131,7 @@ export default {
if
(
!
changedFile
&&
stagedFile
)
{
if
(
!
changedFile
&&
stagedFile
)
{
Object
.
assign
(
state
.
entries
[
path
],
{
Object
.
assign
(
state
.
entries
[
path
],
{
...
stagedFile
,
...
stagedFile
,
key
:
state
.
entries
[
path
].
key
,
changed
:
true
,
changed
:
true
,
});
});
...
...
app/assets/javascripts/ide/stores/utils.js
浏览文件 @
2aaa0222
...
@@ -88,8 +88,7 @@ export const decorateData = entity => {
...
@@ -88,8 +88,7 @@ export const decorateData = entity => {
export
const
findEntry
=
(
tree
,
type
,
name
,
prop
=
'
name
'
)
=>
export
const
findEntry
=
(
tree
,
type
,
name
,
prop
=
'
name
'
)
=>
tree
.
find
(
f
=>
f
.
type
===
type
&&
f
[
prop
]
===
name
);
tree
.
find
(
f
=>
f
.
type
===
type
&&
f
[
prop
]
===
name
);
export
const
findIndexOfFile
=
(
state
,
file
)
=>
export
const
findIndexOfFile
=
(
state
,
file
)
=>
state
.
findIndex
(
f
=>
f
.
path
===
file
.
path
);
state
.
findIndex
(
f
=>
f
.
path
===
file
.
path
);
export
const
setPageTitle
=
title
=>
{
export
const
setPageTitle
=
title
=>
{
document
.
title
=
title
;
document
.
title
=
title
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录