Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e70d06df
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,发现更多精彩内容 >>
提交
e70d06df
编写于
8月 07, 2018
作者:
T
Tim Zallmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Incremental Rendering of the MR
上级
f68f405c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
51 addition
and
7 deletion
+51
-7
app/assets/javascripts/diffs/components/app.vue
app/assets/javascripts/diffs/components/app.vue
+9
-4
app/assets/javascripts/diffs/components/diff_file.vue
app/assets/javascripts/diffs/components/diff_file.vue
+2
-2
app/assets/javascripts/diffs/store/actions.js
app/assets/javascripts/diffs/store/actions.js
+20
-0
app/assets/javascripts/diffs/store/mutation_types.js
app/assets/javascripts/diffs/store/mutation_types.js
+1
-0
app/assets/javascripts/diffs/store/mutations.js
app/assets/javascripts/diffs/store/mutations.js
+19
-1
未找到文件。
app/assets/javascripts/diffs/components/app.vue
浏览文件 @
e70d06df
...
...
@@ -114,11 +114,16 @@ export default {
this
.
adjustView
();
},
methods
:
{
...
mapActions
(
'
diffs
'
,
[
'
setBaseConfig
'
,
'
fetchDiffFiles
'
]),
...
mapActions
(
'
diffs
'
,
[
'
setBaseConfig
'
,
'
fetchDiffFiles
'
,
'
startRenderDiffsQueue
'
]),
fetchData
()
{
this
.
fetchDiffFiles
().
catch
(()
=>
{
createFlash
(
__
(
'
Something went wrong on our end. Please try again!
'
));
});
this
.
fetchDiffFiles
()
.
then
(()
=>
{
console
.
log
(
'
Done
'
);
requestIdleCallback
(
this
.
startRenderDiffsQueue
,
{
timeout
:
1000
});
})
.
catch
(()
=>
{
createFlash
(
__
(
'
Something went wrong on our end. Please try again!
'
));
});
if
(
!
this
.
isNotesFetched
)
{
eventHub
.
$emit
(
'
fetchNotesData
'
);
...
...
app/assets/javascripts/diffs/components/diff_file.vue
浏览文件 @
e70d06df
...
...
@@ -121,12 +121,12 @@ export default {
</div>
<diff-content
v-if=
"!isCollapsed"
v-if=
"!isCollapsed
&& file.renderIt
"
:class=
"
{ hidden: isCollapsed || file.tooLarge }"
:diff-file="file"
/>
<loading-icon
v-if=
"isLoadingCollapsedDiff"
v-if=
"isLoadingCollapsedDiff
|| !file.renderIt
"
class=
"diff-content loading"
/>
<div
...
...
app/assets/javascripts/diffs/store/actions.js
浏览文件 @
e70d06df
...
...
@@ -29,6 +29,26 @@ export const fetchDiffFiles = ({ state, commit }) => {
.
then
(
handleLocationHash
);
};
export
const
startRenderDiffsQueue
=
({
state
,
commit
})
=>
{
const
checkItem
=
()
=>
{
const
nextFile
=
state
.
diffFiles
.
find
(
file
=>
!
file
.
renderIt
&&
!
file
.
collapsed
);
if
(
nextFile
)
{
requestAnimationFrame
(()
=>
{
commit
(
types
.
RENDER_FILE
,
nextFile
);
});
requestIdleCallback
(
()
=>
{
console
.
log
(
'
CALL NEXT
'
);
checkItem
();
},
{
timeout
:
1000
},
);
}
};
checkItem
();
};
export
const
setInlineDiffViewType
=
({
commit
})
=>
{
commit
(
types
.
SET_DIFF_VIEW_TYPE
,
INLINE_DIFF_VIEW_TYPE
);
...
...
app/assets/javascripts/diffs/store/mutation_types.js
浏览文件 @
e70d06df
...
...
@@ -8,3 +8,4 @@ export const REMOVE_COMMENT_FORM_LINE = 'REMOVE_COMMENT_FORM_LINE';
export
const
ADD_CONTEXT_LINES
=
'
ADD_CONTEXT_LINES
'
;
export
const
ADD_COLLAPSED_DIFFS
=
'
ADD_COLLAPSED_DIFFS
'
;
export
const
EXPAND_ALL_FILES
=
'
EXPAND_ALL_FILES
'
;
export
const
RENDER_FILE
=
'
RENDER_FILE
'
;
app/assets/javascripts/diffs/store/mutations.js
浏览文件 @
e70d06df
...
...
@@ -15,8 +15,26 @@ export default {
},
[
types
.
SET_DIFF_DATA
](
state
,
data
)
{
const
diffData
=
convertObjectPropsToCamelCase
(
data
,
{
deep
:
true
});
let
showingLines
=
0
;
diffData
.
diffFiles
.
map
(
file
=>
{
if
(
file
.
highlightedDiffLines
)
{
showingLines
+=
file
.
parallelDiffLines
.
length
;
Object
.
assign
(
file
,
{
renderIt
:
showingLines
<
200
,
collapsed
:
showingLines
>
2000
,
});
}
});
Object
.
assign
(
state
,
{
...
convertObjectPropsToCamelCase
(
data
,
{
deep
:
true
}),
...
diffData
,
});
},
[
types
.
RENDER_FILE
](
state
,
file
)
{
Object
.
assign
(
file
,
{
renderIt
:
true
,
});
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录