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
01e5189e
Commit
01e5189e
authored
Feb 21, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dropdown-loading-class-add' into 'master'
Changes when loading indicator is added to dropdown See merge request !9345
parents
b596dd8f
3c20a647
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+2
-1
ref_switcher_spec.rb
spec/features/projects/ref_switcher_spec.rb
+2
-0
No files found.
app/assets/javascripts/gl_dropdown.js
View file @
01e5189e
...
...
@@ -47,9 +47,10 @@
}
// Only filter asynchronously only if option remote is set
if
(
this
.
options
.
remote
)
{
$inputContainer
.
parent
().
addClass
(
'is-loading'
);
clearTimeout
(
timeout
);
return
timeout
=
setTimeout
(
function
()
{
$inputContainer
.
parent
().
addClass
(
'is-loading'
);
return
this
.
options
.
query
(
this
.
input
.
val
(),
function
(
data
)
{
$inputContainer
.
parent
().
removeClass
(
'is-loading'
);
return
this
.
options
.
callback
(
data
);
...
...
spec/features/projects/ref_switcher_spec.rb
View file @
01e5189e
...
...
@@ -20,6 +20,8 @@ feature 'Ref switcher', feature: true, js: true do
input
.
set
'binary'
wait_for_ajax
expect
(
find
(
'.dropdown-content ul'
)).
to
have_selector
(
'li'
,
count:
6
)
page
.
within
'.dropdown-content ul'
do
input
.
native
.
send_keys
:enter
end
...
...
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