Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e2f27393
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,发现更多精彩内容 >>
未验证
提交
e2f27393
编写于
3月 22, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
toggling viewer mode closes the pending tab
then opens the file in edit mode
上级
002cc923
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
33 addition
and
7 deletion
+33
-7
app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
...s/javascripts/ide/components/commit_sidebar/list_item.vue
+0
-2
app/assets/javascripts/ide/components/ide.vue
app/assets/javascripts/ide/components/ide.vue
+1
-0
app/assets/javascripts/ide/components/repo_tabs.vue
app/assets/javascripts/ide/components/repo_tabs.vue
+16
-2
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+9
-3
app/assets/javascripts/ide/stores/mutations/file.js
app/assets/javascripts/ide/stores/mutations/file.js
+7
-0
未找到文件。
app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
浏览文件 @
e2f27393
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
router
from
'
../../ide_router
'
;
export
default
{
components
:
{
...
...
@@ -26,7 +25,6 @@ export default {
openFileInEditor
(
file
)
{
return
this
.
updateViewer
(
'
diff
'
).
then
(()
=>
{
this
.
openPendingTab
(
file
);
router
.
push
(
`/project/
${
file
.
projectId
}
/tree/master/`
);
});
},
},
...
...
app/assets/javascripts/ide/components/ide.vue
浏览文件 @
e2f27393
...
...
@@ -60,6 +60,7 @@ export default {
v-if=
"activeFile"
>
<repo-tabs
:active-file=
"activeFile"
:files=
"tabs"
:viewer=
"viewer"
:has-changes=
"hasChanges"
...
...
app/assets/javascripts/ide/components/repo_tabs.vue
浏览文件 @
e2f27393
...
...
@@ -2,6 +2,7 @@
import
{
mapActions
}
from
'
vuex
'
;
import
RepoTab
from
'
./repo_tab.vue
'
;
import
EditorMode
from
'
./editor_mode_dropdown.vue
'
;
import
router
from
'
../ide_router
'
;
export
default
{
components
:
{
...
...
@@ -9,6 +10,10 @@ export default {
EditorMode
,
},
props
:
{
activeFile
:
{
type
:
Object
,
required
:
true
,
},
files
:
{
type
:
Array
,
required
:
true
,
...
...
@@ -33,7 +38,16 @@ export default {
this
.
showShadow
=
this
.
$refs
.
tabsScroller
.
scrollWidth
>
this
.
$refs
.
tabsScroller
.
offsetWidth
;
},
methods
:
{
...
mapActions
([
'
updateViewer
'
]),
...
mapActions
([
'
updateViewer
'
,
'
removePendingTab
'
]),
openFileViewer
(
viewer
)
{
this
.
updateViewer
(
viewer
);
if
(
this
.
activeFile
.
pending
)
{
this
.
removePendingTab
(
this
.
activeFile
).
then
(()
=>
{
router
.
push
(
`/project
${
this
.
activeFile
.
url
}
`
);
});
}
},
},
};
</
script
>
...
...
@@ -54,7 +68,7 @@ export default {
:viewer=
"viewer"
:show-shadow=
"showShadow"
:has-changes=
"hasChanges"
@
click=
"
updat
eViewer"
@
click=
"
openFil
eViewer"
/>
</div>
</
template
>
app/assets/javascripts/ide/stores/actions/file.js
浏览文件 @
e2f27393
...
...
@@ -18,9 +18,9 @@ export const closeFile = ({ commit, state, getters, dispatch }, file) => {
commit
(
types
.
TOGGLE_FILE_OPEN
,
path
);
commit
(
types
.
SET_FILE_ACTIVE
,
{
path
,
active
:
false
});
if
(
state
.
openFile
s
.
length
>
0
&&
fileWasActive
)
{
if
(
getters
.
tab
s
.
length
>
0
&&
fileWasActive
)
{
const
nextIndexToOpen
=
indexOfClosedFile
===
0
?
0
:
indexOfClosedFile
-
1
;
const
nextFileToOpen
=
state
.
entries
[
state
.
openFiles
[
nextIndexToOpen
].
path
];
const
nextFileToOpen
=
state
.
openFiles
[
nextIndexToOpen
];
router
.
push
(
`/project
${
nextFileToOpen
.
url
}
`
);
}
else
if
(
!
state
.
openFiles
.
length
)
{
...
...
@@ -133,6 +133,12 @@ export const discardFileChanges = ({ state, commit }, path) => {
eventHub
.
$emit
(
`editor.update.model.content.
${
file
.
path
}
`
,
file
.
raw
);
};
export
const
openPendingTab
=
({
commit
},
file
)
=>
{
export
const
openPendingTab
=
({
commit
,
state
},
file
)
=>
{
commit
(
types
.
ADD_PENDING_TAB
,
file
);
router
.
push
(
`/project/
${
file
.
projectId
}
/tree/
${
state
.
currentBranchId
}
/`
);
};
export
const
removePendingTab
=
({
commit
},
file
)
=>
{
commit
(
types
.
REMOVE_PENDING_TAB
,
file
);
};
app/assets/javascripts/ide/stores/mutations/file.js
浏览文件 @
e2f27393
...
...
@@ -5,6 +5,13 @@ export default {
Object
.
assign
(
state
.
entries
[
path
],
{
active
,
});
Object
.
assign
(
state
,
{
pendingTabs
:
state
.
pendingTabs
.
map
(
f
=>
({
...
f
,
active
:
false
,
})),
});
},
[
types
.
TOGGLE_FILE_OPEN
](
state
,
path
)
{
Object
.
assign
(
state
.
entries
[
path
],
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录