Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
02e40474
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,发现更多精彩内容 >>
提交
02e40474
编写于
3月 08, 2017
作者:
A
Alfredo Sumaran
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix-fs-edit-dropdown' into 'master'
Fix filtered search visual token editing dropdown See merge request !9794
上级
ed49a8e3
de87b94d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
3 deletion
+21
-3
app/assets/javascripts/filtered_search/filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+5
-3
spec/features/issues/filtered_search/visual_tokens_spec.rb
spec/features/issues/filtered_search/visual_tokens_spec.rb
+16
-0
未找到文件。
app/assets/javascripts/filtered_search/filtered_search_manager.js
浏览文件 @
02e40474
...
...
@@ -35,6 +35,7 @@
this
.
checkForBackspaceWrapper
=
this
.
checkForBackspace
.
bind
(
this
);
this
.
removeSelectedTokenWrapper
=
this
.
removeSelectedToken
.
bind
(
this
);
this
.
unselectEditTokensWrapper
=
this
.
unselectEditTokens
.
bind
(
this
);
this
.
editTokenWrapper
=
this
.
editToken
.
bind
(
this
);
this
.
tokenChange
=
this
.
tokenChange
.
bind
(
this
);
this
.
filteredSearchInput
.
form
.
addEventListener
(
'
submit
'
,
this
.
handleFormSubmit
);
...
...
@@ -47,7 +48,7 @@
this
.
filteredSearchInput
.
addEventListener
(
'
click
'
,
this
.
tokenChange
);
this
.
filteredSearchInput
.
addEventListener
(
'
keyup
'
,
this
.
tokenChange
);
this
.
tokensContainer
.
addEventListener
(
'
click
'
,
FilteredSearchManager
.
selectToken
);
this
.
tokensContainer
.
addEventListener
(
'
dblclick
'
,
FilteredSearchManager
.
editToken
);
this
.
tokensContainer
.
addEventListener
(
'
dblclick
'
,
this
.
editTokenWrapper
);
this
.
clearSearchButton
.
addEventListener
(
'
click
'
,
this
.
clearSearchWrapper
);
document
.
addEventListener
(
'
click
'
,
gl
.
FilteredSearchVisualTokens
.
unselectTokens
);
document
.
addEventListener
(
'
click
'
,
this
.
unselectEditTokensWrapper
);
...
...
@@ -65,7 +66,7 @@
this
.
filteredSearchInput
.
removeEventListener
(
'
click
'
,
this
.
tokenChange
);
this
.
filteredSearchInput
.
removeEventListener
(
'
keyup
'
,
this
.
tokenChange
);
this
.
tokensContainer
.
removeEventListener
(
'
click
'
,
FilteredSearchManager
.
selectToken
);
this
.
tokensContainer
.
removeEventListener
(
'
dblclick
'
,
FilteredSearchManager
.
editToken
);
this
.
tokensContainer
.
removeEventListener
(
'
dblclick
'
,
this
.
editTokenWrapper
);
this
.
clearSearchButton
.
removeEventListener
(
'
click
'
,
this
.
clearSearchWrapper
);
document
.
removeEventListener
(
'
click
'
,
gl
.
FilteredSearchVisualTokens
.
unselectTokens
);
document
.
removeEventListener
(
'
click
'
,
this
.
unselectEditTokensWrapper
);
...
...
@@ -134,11 +135,12 @@
}
}
static
editToken
(
e
)
{
editToken
(
e
)
{
const
token
=
e
.
target
.
closest
(
'
.js-visual-token
'
);
if
(
token
)
{
gl
.
FilteredSearchVisualTokens
.
editToken
(
token
);
this
.
tokenChange
();
}
}
...
...
spec/features/issues/filtered_search/visual_tokens_spec.rb
浏览文件 @
02e40474
...
...
@@ -226,6 +226,22 @@ describe 'Visual tokens', js: true, feature: true do
end
end
describe
'editing multiple tokens'
do
before
do
input_filtered_search
(
'author:@root assignee:none'
,
submit:
false
)
first
(
'.tokens-container .filtered-search-token'
).
double_click
end
it
'opens author dropdown'
do
expect
(
page
).
to
have_css
(
'#js-dropdown-author'
,
visible:
true
)
end
it
'opens assignee dropdown'
do
find
(
'.tokens-container .filtered-search-token'
,
text:
'Assignee'
).
double_click
expect
(
page
).
to
have_css
(
'#js-dropdown-assignee'
,
visible:
true
)
end
end
describe
'add new token after editing existing token'
do
before
do
input_filtered_search
(
'author:@root assignee:none'
,
submit:
false
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录