Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5dbb7a25
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,发现更多精彩内容 >>
未验证
提交
5dbb7a25
编写于
3月 23, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed opening next tab being a pending tab
clears any active files when opening pending tab
上级
c4395488
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
33 addition
and
12 deletion
+33
-12
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+10
-4
app/assets/javascripts/ide/stores/mutations/file.js
app/assets/javascripts/ide/stores/mutations/file.js
+23
-8
未找到文件。
app/assets/javascripts/ide/stores/actions/file.js
浏览文件 @
5dbb7a25
...
...
@@ -12,7 +12,7 @@ export const closeFile = ({ commit, state, getters, dispatch }, file) => {
if
(
file
.
pending
)
{
commit
(
types
.
REMOVE_PENDING_TAB
,
file
);
}
else
{
const
indexOfClosedFile
=
state
.
openFile
s
.
findIndex
(
f
=>
f
.
path
===
path
);
const
indexOfClosedFile
=
getters
.
tab
s
.
findIndex
(
f
=>
f
.
path
===
path
);
const
fileWasActive
=
file
.
active
;
commit
(
types
.
TOGGLE_FILE_OPEN
,
path
);
...
...
@@ -21,9 +21,13 @@ export const closeFile = ({ commit, state, getters, dispatch }, file) => {
if
(
getters
.
tabs
.
length
>
0
&&
fileWasActive
)
{
const
nextIndexToOpen
=
indexOfClosedFile
===
0
?
0
:
indexOfClosedFile
-
1
;
const
nextFileToOpen
=
state
.
openFile
s
[
nextIndexToOpen
];
const
nextFileToOpen
=
getters
.
tab
s
[
nextIndexToOpen
];
if
(
nextFileToOpen
.
pending
)
{
dispatch
(
'
openPendingTab
'
,
nextFileToOpen
);
}
else
{
router
.
push
(
`/project
${
nextFileToOpen
.
url
}
`
);
}
}
else
if
(
!
state
.
openFiles
.
length
)
{
router
.
push
(
`/project/
${
file
.
projectId
}
/tree/
${
file
.
branchId
}
/`
);
}
...
...
@@ -151,9 +155,11 @@ export const discardFileChanges = ({ state, commit }, path) => {
eventHub
.
$emit
(
`editor.update.model.content.
${
file
.
path
}
`
,
file
.
raw
);
};
export
const
openPendingTab
=
({
commit
,
state
},
file
)
=>
{
export
const
openPendingTab
=
({
commit
,
dispatch
,
state
},
file
)
=>
{
commit
(
types
.
ADD_PENDING_TAB
,
file
);
dispatch
(
'
scrollToTab
'
);
router
.
push
(
`/project/
${
file
.
projectId
}
/tree/
${
state
.
currentBranchId
}
/`
);
};
...
...
app/assets/javascripts/ide/stores/mutations/file.js
浏览文件 @
5dbb7a25
...
...
@@ -88,6 +88,16 @@ export default {
});
},
[
types
.
ADD_PENDING_TAB
](
state
,
file
)
{
const
pendingTab
=
state
.
pendingTabs
.
find
(
f
=>
f
.
path
===
file
.
path
);
if
(
pendingTab
)
{
Object
.
assign
(
state
,
{
pendingTabs
:
state
.
pendingTabs
.
map
(
tab
=>
({
...
tab
,
active
:
!!
pendingTab
,
})),
});
}
else
{
Object
.
assign
(
state
,
{
pendingTabs
:
state
.
pendingTabs
.
concat
({
...
file
,
...
...
@@ -95,7 +105,12 @@ export default {
pending
:
true
,
key
:
`pending-
${
file
.
key
}
`
,
}),
openFiles
:
state
.
openFiles
.
map
(
f
=>
({
...
f
,
active
:
false
,
})),
});
}
},
[
types
.
REMOVE_PENDING_TAB
](
state
,
file
)
{
Object
.
assign
(
state
,
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录