Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
dfa4a440
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,发现更多精彩内容 >>
提交
dfa4a440
编写于
6月 08, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed dropdown filter input not focusing after transition
Closes #33216
上级
fd072e22
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
4 deletion
+22
-4
app/assets/javascripts/gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+15
-3
changelogs/unreleased/issuable-sidebar-edit-button-field-focus.yml
...s/unreleased/issuable-sidebar-edit-button-field-focus.yml
+4
-0
spec/javascripts/gl_dropdown_spec.js
spec/javascripts/gl_dropdown_spec.js
+3
-1
未找到文件。
app/assets/javascripts/gl_dropdown.js
浏览文件 @
dfa4a440
...
...
@@ -248,7 +248,7 @@ GitLabDropdown = (function() {
return
function
(
data
)
{
_this
.
fullData
=
data
;
_this
.
parseData
(
_this
.
fullData
);
_this
.
focusTextInput
();
_this
.
focusTextInput
(
true
);
if
(
_this
.
options
.
filterable
&&
_this
.
filter
&&
_this
.
filter
.
input
&&
_this
.
filter
.
input
.
val
()
&&
_this
.
filter
.
input
.
val
().
trim
()
!==
''
)
{
return
_this
.
filter
.
input
.
trigger
(
'
input
'
);
}
...
...
@@ -728,8 +728,20 @@ GitLabDropdown = (function() {
return
[
selectedObject
,
isMarking
];
};
GitLabDropdown
.
prototype
.
focusTextInput
=
function
()
{
if
(
this
.
options
.
filterable
)
{
this
.
filterInput
.
focus
();
}
GitLabDropdown
.
prototype
.
focusTextInput
=
function
(
triggerFocus
=
false
)
{
if
(
this
.
options
.
filterable
)
{
$
(
'
:focus
'
).
blur
();
this
.
dropdown
.
one
(
'
transitionend
'
,
()
=>
{
this
.
filterInput
.
focus
();
});
if
(
triggerFocus
)
{
// This triggers after a ajax request
// in case of slow requests, the dropdown transition could already be finished
this
.
dropdown
.
trigger
(
'
transitionend
'
);
}
}
};
GitLabDropdown
.
prototype
.
addInput
=
function
(
fieldName
,
value
,
selectedObject
)
{
...
...
changelogs/unreleased/issuable-sidebar-edit-button-field-focus.yml
0 → 100644
浏览文件 @
dfa4a440
---
title
:
Fixed dropdown filter input not focusing after transition
merge_request
:
author
:
spec/javascripts/gl_dropdown_spec.js
浏览文件 @
dfa4a440
...
...
@@ -185,7 +185,7 @@ import '~/lib/utils/url_utility';
expect
(
$
(
document
.
activeElement
)).
toEqual
(
$
(
SEARCH_INPUT_SELECTOR
));
});
it
(
'
should focus on input when opening for the second time
'
,
()
=>
{
it
(
'
should focus on input when opening for the second time
after transition
'
,
()
=>
{
remoteCallback
();
this
.
dropdownContainerElement
.
trigger
({
type
:
'
keyup
'
,
...
...
@@ -193,6 +193,7 @@ import '~/lib/utils/url_utility';
keyCode
:
ARROW_KEYS
.
ESC
});
this
.
dropdownButtonElement
.
click
();
this
.
dropdownContainerElement
.
trigger
(
'
transitionend
'
);
expect
(
$
(
document
.
activeElement
)).
toEqual
(
$
(
SEARCH_INPUT_SELECTOR
));
});
});
...
...
@@ -201,6 +202,7 @@ import '~/lib/utils/url_utility';
it
(
'
should focus input when passing array data to drop down
'
,
()
=>
{
initDropDown
.
call
(
this
,
false
,
true
);
this
.
dropdownButtonElement
.
click
();
this
.
dropdownContainerElement
.
trigger
(
'
transitionend
'
);
expect
(
$
(
document
.
activeElement
)).
toEqual
(
$
(
SEARCH_INPUT_SELECTOR
));
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录