Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
35daaa36
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
35daaa36
编写于
10月 23, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
calculate the stickyTop instead of hard coding a variable
上级
016e7503
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
4 deletion
+13
-4
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+2
-1
app/assets/javascripts/init_changes_dropdown.js
app/assets/javascripts/init_changes_dropdown.js
+2
-2
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+9
-1
未找到文件。
app/assets/javascripts/dispatcher.js
浏览文件 @
35daaa36
...
...
@@ -239,7 +239,8 @@ import Diff from './diff';
break
;
case
'
projects:compare:show
'
:
new
Diff
();
initChangesDropdown
();
const
paddingTop
=
16
;
initChangesDropdown
(
document
.
querySelector
(
'
.navbar-gitlab
'
).
offsetHeight
-
paddingTop
);
break
;
case
'
projects:branches:new
'
:
case
'
projects:branches:create
'
:
...
...
app/assets/javascripts/init_changes_dropdown.js
浏览文件 @
35daaa36
import
stickyMonitor
from
'
./lib/utils/sticky
'
;
export
default
()
=>
{
stickyMonitor
(
document
.
querySelector
(
'
.js-diff-files-changed
'
),
76
);
export
default
(
stickyTop
)
=>
{
stickyMonitor
(
document
.
querySelector
(
'
.js-diff-files-changed
'
),
stickyTop
);
$
(
'
.js-diff-stats-dropdown
'
).
glDropdown
({
filterable
:
true
,
...
...
app/assets/javascripts/merge_request_tabs.js
浏览文件 @
35daaa36
...
...
@@ -67,6 +67,9 @@ import Diff from './diff';
class
MergeRequestTabs
{
constructor
({
action
,
setUrl
,
stubLocation
}
=
{})
{
const
mergeRequestTabs
=
document
.
querySelector
(
'
.js-tabs-affix
'
);
const
paddingTop
=
16
;
this
.
diffsLoaded
=
false
;
this
.
pipelinesLoaded
=
false
;
this
.
commitsLoaded
=
false
;
...
...
@@ -76,6 +79,11 @@ import Diff from './diff';
this
.
setCurrentAction
=
this
.
setCurrentAction
.
bind
(
this
);
this
.
tabShown
=
this
.
tabShown
.
bind
(
this
);
this
.
showTab
=
this
.
showTab
.
bind
(
this
);
this
.
stickyTop
=
document
.
querySelector
(
'
.navbar-gitlab
'
).
offsetHeight
-
paddingTop
;
if
(
mergeRequestTabs
)
{
this
.
stickyTop
+=
mergeRequestTabs
.
offsetHeight
;
}
if
(
stubLocation
)
{
location
=
stubLocation
;
...
...
@@ -278,7 +286,7 @@ import Diff from './diff';
const
$container
=
$
(
'
#diffs
'
);
$container
.
html
(
data
.
html
);
initChangesDropdown
();
initChangesDropdown
(
this
.
stickyTop
);
if
(
typeof
gl
.
diffNotesCompileComponents
!==
'
undefined
'
)
{
gl
.
diffNotesCompileComponents
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录