BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
02e40474
Commit
02e40474
authored
Mar 08, 2017
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-fs-edit-dropdown' into 'master'
Fix filtered search visual token editing dropdown See merge request !9794
parents
ed49a8e3
de87b94d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
3 deletions
+21
-3
filtered_search_manager.js
...ts/javascripts/filtered_search/filtered_search_manager.js
+5
-3
visual_tokens_spec.rb
spec/features/issues/filtered_search/visual_tokens_spec.rb
+16
-0
No files found.
app/assets/javascripts/filtered_search/filtered_search_manager.js
View file @
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
View file @
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment