Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3380ee71
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,发现更多精彩内容 >>
提交
3380ee71
编写于
3月 23, 2017
作者:
E
Eric Eastwood
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix container issue when switching parallel "Changes" MR tab before done loading
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/29193
上级
ca6a7f1e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
5 deletion
+29
-5
app/assets/javascripts/diff.js
app/assets/javascripts/diff.js
+0
-4
spec/javascripts/merge_request_tabs_spec.js
spec/javascripts/merge_request_tabs_spec.js
+29
-1
未找到文件。
app/assets/javascripts/diff.js
浏览文件 @
3380ee71
...
...
@@ -13,10 +13,6 @@ class Diff {
$diffFile
.
each
((
index
,
file
)
=>
new
gl
.
ImageFile
(
file
));
if
(
this
.
diffViewType
()
===
'
parallel
'
)
{
$
(
'
.content-wrapper .container-fluid
'
).
removeClass
(
'
container-limited
'
);
}
if
(
!
isBound
)
{
$
(
document
)
.
on
(
'
click
'
,
'
.js-unfold
'
,
this
.
handleClickUnfold
.
bind
(
this
))
...
...
spec/javascripts/merge_request_tabs_spec.js
浏览文件 @
3380ee71
...
...
@@ -3,6 +3,9 @@
require
(
'
~/merge_request_tabs
'
);
require
(
'
~/breakpoints
'
);
require
(
'
~/lib/utils/common_utils
'
);
require
(
'
~/diff
'
);
require
(
'
~/single_file_diff
'
);
require
(
'
~/files_comment_button
'
);
require
(
'
vendor/jquery.scrollTo
'
);
(
function
()
{
...
...
@@ -213,6 +216,10 @@ require('vendor/jquery.scrollTo');
describe
(
'
with "Side-by-side"/parallel diff view
'
,
()
=>
{
beforeEach
(
function
()
{
this
.
class
.
diffViewType
=
()
=>
'
parallel
'
;
gl
.
Diff
.
prototype
.
diffViewType
=
()
=>
'
parallel
'
;
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
(
options
)
{
options
.
success
({
html
:
''
});
});
});
it
(
'
maintains `container-limited` for pipelines tab
'
,
function
(
done
)
{
...
...
@@ -224,7 +231,6 @@ require('vendor/jquery.scrollTo');
});
});
};
asyncClick
(
'
.merge-request-tabs .pipelines-tab a
'
)
.
then
(()
=>
asyncClick
(
'
.merge-request-tabs .diffs-tab a
'
))
.
then
(()
=>
asyncClick
(
'
.merge-request-tabs .pipelines-tab a
'
))
...
...
@@ -237,6 +243,28 @@ require('vendor/jquery.scrollTo');
done
.
fail
(
`Something went wrong clicking MR tabs:
${
err
.
message
}
\n
${
err
.
stack
}
`
);
});
});
it
(
'
maintains `container-limited` when switching from "Changes" tab before it loads
'
,
function
(
done
)
{
const
asyncClick
=
function
(
selector
)
{
return
new
Promise
((
resolve
)
=>
{
setTimeout
(()
=>
{
document
.
querySelector
(
selector
).
click
();
resolve
();
});
});
};
asyncClick
(
'
.merge-request-tabs .diffs-tab a
'
)
.
then
(()
=>
asyncClick
(
'
.merge-request-tabs .notes-tab a
'
))
.
then
(()
=>
{
const
hasContainerLimitedClass
=
document
.
querySelector
(
'
.content-wrapper .container-fluid
'
).
classList
.
contains
(
'
container-limited
'
);
expect
(
hasContainerLimitedClass
).
toBe
(
true
);
})
.
then
(
done
)
.
catch
((
err
)
=>
{
done
.
fail
(
`Something went wrong clicking MR tabs:
${
err
.
message
}
\n
${
err
.
stack
}
`
);
});
});
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录