Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fe10964a
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,发现更多精彩内容 >>
提交
fe10964a
编写于
2月 18, 2019
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix-diffs-not-rendering' into 'master'
Fix diff files not rendering See merge request gitlab-org/gitlab-ce!25358
上级
22264555
512f9624
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
8 deletion
+15
-8
app/assets/javascripts/diffs/components/diff_file.vue
app/assets/javascripts/diffs/components/diff_file.vue
+4
-5
app/assets/javascripts/diffs/store/actions.js
app/assets/javascripts/diffs/store/actions.js
+2
-0
spec/javascripts/diffs/components/diff_file_spec.js
spec/javascripts/diffs/components/diff_file_spec.js
+2
-3
spec/javascripts/diffs/store/actions_spec.js
spec/javascripts/diffs/store/actions_spec.js
+7
-0
未找到文件。
app/assets/javascripts/diffs/components/diff_file.vue
浏览文件 @
fe10964a
...
...
@@ -35,7 +35,6 @@ export default {
isLoadingCollapsedDiff
:
false
,
forkMessageVisible
:
false
,
isCollapsed
:
this
.
file
.
viewer
.
collapsed
||
false
,
renderIt
:
this
.
file
.
renderIt
,
};
},
computed
:
{
...
...
@@ -53,7 +52,7 @@ export default {
);
},
showLoadingIcon
()
{
return
this
.
isLoadingCollapsedDiff
||
(
!
this
.
renderIt
&&
!
this
.
isCollapsed
);
return
this
.
isLoadingCollapsedDiff
||
(
!
this
.
file
.
renderIt
&&
!
this
.
isCollapsed
);
},
hasDiffLines
()
{
return
(
...
...
@@ -80,13 +79,13 @@ export default {
eventHub
.
$on
(
`loadCollapsedDiff/
${
this
.
file
.
file_hash
}
`
,
this
.
handleLoadCollapsedDiff
);
},
methods
:
{
...
mapActions
(
'
diffs
'
,
[
'
loadCollapsedDiff
'
,
'
assignDiscussionsToDiff
'
]),
...
mapActions
(
'
diffs
'
,
[
'
loadCollapsedDiff
'
,
'
assignDiscussionsToDiff
'
,
'
setRenderIt
'
]),
handleToggle
()
{
if
(
!
this
.
hasDiffLines
)
{
this
.
handleLoadCollapsedDiff
();
}
else
{
this
.
isCollapsed
=
!
this
.
isCollapsed
;
this
.
renderIt
=
true
;
this
.
setRenderIt
(
this
.
file
)
;
}
},
handleLoadCollapsedDiff
()
{
...
...
@@ -96,7 +95,7 @@ export default {
.
then
(()
=>
{
this
.
isLoadingCollapsedDiff
=
false
;
this
.
isCollapsed
=
false
;
this
.
renderIt
=
true
;
this
.
setRenderIt
(
this
.
file
)
;
})
.
then
(()
=>
{
requestIdleCallback
(
...
...
app/assets/javascripts/diffs/store/actions.js
浏览文件 @
fe10964a
...
...
@@ -131,6 +131,8 @@ export const startRenderDiffsQueue = ({ state, commit }) => {
return
checkItem
();
};
export
const
setRenderIt
=
({
commit
},
file
)
=>
commit
(
types
.
RENDER_FILE
,
file
);
export
const
setInlineDiffViewType
=
({
commit
})
=>
{
commit
(
types
.
SET_DIFF_VIEW_TYPE
,
INLINE_DIFF_VIEW_TYPE
);
...
...
spec/javascripts/diffs/components/diff_file_spec.js
浏览文件 @
fe10964a
...
...
@@ -28,8 +28,7 @@ describe('DiffFile', () => {
expect
(
el
.
querySelector
(
'
.file-title-name
'
).
innerText
.
indexOf
(
file_path
)).
toBeGreaterThan
(
-
1
);
expect
(
el
.
querySelector
(
'
.js-syntax-highlight
'
)).
toBeDefined
();
expect
(
vm
.
renderIt
).
toEqual
(
false
);
vm
.
renderIt
=
true
;
vm
.
file
.
renderIt
=
true
;
vm
.
$nextTick
(()
=>
{
expect
(
el
.
querySelectorAll
(
'
.line_content
'
).
length
).
toBeGreaterThan
(
5
);
...
...
@@ -41,7 +40,7 @@ describe('DiffFile', () => {
expect
(
vm
.
$el
.
querySelectorAll
(
'
.diff-content
'
).
length
).
toEqual
(
1
);
expect
(
vm
.
isCollapsed
).
toEqual
(
false
);
vm
.
isCollapsed
=
true
;
vm
.
renderIt
=
true
;
vm
.
file
.
renderIt
=
true
;
vm
.
$nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.diff-content
'
).
length
).
toEqual
(
0
);
...
...
spec/javascripts/diffs/store/actions_spec.js
浏览文件 @
fe10964a
...
...
@@ -29,6 +29,7 @@ import actions, {
renderFileForDiscussionId
,
setRenderTreeList
,
setShowWhitespace
,
setRenderIt
,
}
from
'
~/diffs/store/actions
'
;
import
eventHub
from
'
~/notes/event_hub
'
;
import
*
as
types
from
'
~/diffs/store/mutation_types
'
;
...
...
@@ -855,4 +856,10 @@ describe('DiffsStoreActions', () => {
expect
(
window
.
history
.
pushState
).
toHaveBeenCalled
();
});
});
describe
(
'
setRenderIt
'
,
()
=>
{
it
(
'
commits RENDER_FILE
'
,
done
=>
{
testAction
(
setRenderIt
,
'
file
'
,
{},
[{
type
:
types
.
RENDER_FILE
,
payload
:
'
file
'
}],
[],
done
);
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录