Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
dfd15697
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,发现更多精彩内容 >>
提交
dfd15697
编写于
12月 13, 2016
作者:
K
Kushal Pandya
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor build log scroll button logic to prevent icon overlaps
上级
3ed1f6dc
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
11 deletion
+16
-11
app/assets/javascripts/build.js
app/assets/javascripts/build.js
+16
-11
未找到文件。
app/assets/javascripts/build.js
浏览文件 @
dfd15697
...
...
@@ -28,6 +28,7 @@
this
.
$downBuildTrace
=
$
(
'
#down-build-trace
'
);
this
.
$scrollTopBtn
=
$
(
'
#scroll-top
'
);
this
.
$scrollBottomBtn
=
$
(
'
#scroll-bottom
'
);
this
.
$buildRefreshAnimation
=
$
(
'
.js-build-refresh
'
);
clearInterval
(
Build
.
interval
);
// Init breakpoint checker
...
...
@@ -91,7 +92,7 @@
$
(
'
.js-build-output
'
).
html
(
buildData
.
trace_html
);
if
(
removeRefreshStatuses
.
indexOf
(
buildData
.
status
)
>=
0
)
{
this
.
initScrollMonitor
();
return
$
(
'
.js-build-refresh
'
)
.
remove
();
return
this
.
$buildRefreshAnimation
.
remove
();
}
}.
bind
(
this
)
});
...
...
@@ -157,23 +158,27 @@
// - Show Bottom Arrow button
// - Disable Autoscroll and hide indicator (when build is running)
Build
.
prototype
.
initScrollMonitor
=
function
()
{
if
(
gl
.
utils
.
isInViewport
(
this
.
$upBuildTrace
[
0
]))
{
// User is at Top
of Build Log
this
.
$scrollTopBtn
.
hide
();
if
(
!
gl
.
utils
.
isInViewport
(
this
.
$upBuildTrace
[
0
])
&&
!
gl
.
utils
.
isInViewport
(
this
.
$downBuildTrace
[
0
]))
{
// User is somewhere in middle
of Build Log
this
.
$scrollTopBtn
.
show
();
this
.
$scrollBottomBtn
.
show
();
}
if
(
gl
.
utils
.
isInViewport
(
this
.
$downBuildTrace
[
0
]))
{
// User is at Bottom of Build Log
// Hide Autoscroll Status Indicator
this
.
$autoScrollContainer
.
hide
();
this
.
$autoScrollStatusText
.
removeClass
(
'
animate
'
);
}
else
if
(
gl
.
utils
.
isInViewport
(
this
.
$upBuildTrace
[
0
])
&&
!
gl
.
utils
.
isInViewport
(
this
.
$downBuildTrace
[
0
]))
{
// User is at Top of Build Log
this
.
$scrollTopBtn
.
hide
();
this
.
$scrollBottomBtn
.
show
();
}
else
if
((
!
gl
.
utils
.
isInViewport
(
this
.
$upBuildTrace
[
0
])
&&
gl
.
utils
.
isInViewport
(
this
.
$downBuildTrace
[
0
]))
||
gl
.
utils
.
isInViewport
(
this
.
$buildRefreshAnimation
[
0
]))
{
// User is at Bottom of Build Log
this
.
$scrollTopBtn
.
show
();
this
.
$scrollBottomBtn
.
hide
();
// Show and Reposition Autoscroll Status Indicator
this
.
$autoScrollContainer
.
css
({
top
:
this
.
$body
.
outerHeight
()
-
75
}).
fadeIn
(
100
);
this
.
$autoScrollStatusText
.
addClass
(
'
animate
'
);
}
if
(
!
gl
.
utils
.
isInViewport
(
this
.
$upBuildTrace
[
0
])
&&
!
gl
.
utils
.
isInViewport
(
this
.
$downBuildTrace
[
0
]))
{
// User is somewhere in middle of Build Log
this
.
$scrollTopBtn
.
show
();
this
.
$scrollBottomBtn
.
show
();
}
else
if
(
gl
.
utils
.
isInViewport
(
this
.
$upBuildTrace
[
0
])
&&
gl
.
utils
.
isInViewport
(
this
.
$downBuildTrace
[
0
]))
{
// Build Log height is small
this
.
$scrollTopBtn
.
hide
();
this
.
$scrollBottomBtn
.
hide
();
// Hide Autoscroll Status Indicator
this
.
$autoScrollContainer
.
hide
();
...
...
@@ -182,7 +187,7 @@
if
(
this
.
buildStatus
===
"
running
"
||
this
.
buildStatus
===
"
pending
"
)
{
// Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise.
this
.
$autoScrollStatus
.
data
(
"
state
"
,
gl
.
utils
.
isInViewport
(
$
(
'
.js-build-refresh
'
)
[
0
])
?
'
enabled
'
:
'
disabled
'
);
this
.
$autoScrollStatus
.
data
(
"
state
"
,
gl
.
utils
.
isInViewport
(
this
.
$buildRefreshAnimation
[
0
])
?
'
enabled
'
:
'
disabled
'
);
}
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录