Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
b80df087
Commit
b80df087
authored
Feb 19, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add timeout for ajax call in award emoji steps; update focus in award picker
parent
074fa8f2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+2
-1
features/steps/project/issues/award_emoji.rb
features/steps/project/issues/award_emoji.rb
+1
-0
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
b80df087
...
@@ -5,7 +5,6 @@ class @AwardsHandler
...
@@ -5,7 +5,6 @@ class @AwardsHandler
event
.
preventDefault
()
event
.
preventDefault
()
@
showEmojiMenu
()
@
showEmojiMenu
()
$
(
"#emoji_search"
).
focus
()
$
(
"html"
).
on
'click'
,
(
event
)
->
$
(
"html"
).
on
'click'
,
(
event
)
->
if
!
$
(
event
.
target
).
closest
(
".emoji-menu"
).
length
if
!
$
(
event
.
target
).
closest
(
".emoji-menu"
).
length
...
@@ -18,10 +17,12 @@ class @AwardsHandler
...
@@ -18,10 +17,12 @@ class @AwardsHandler
showEmojiMenu
:
->
showEmojiMenu
:
->
if
$
(
".emoji-menu"
).
length
if
$
(
".emoji-menu"
).
length
$
(
".emoji-menu"
).
show
()
$
(
".emoji-menu"
).
show
()
$
(
"#emoji_search"
).
focus
()
else
else
$
.
get
"/emoji_menu"
,
(
response
)
->
$
.
get
"/emoji_menu"
,
(
response
)
->
$
(
".add-award"
).
after
response
$
(
".add-award"
).
after
response
$
(
".emoji-menu"
).
show
()
$
(
".emoji-menu"
).
show
()
$
(
"#emoji_search"
).
focus
()
addAward
:
(
emoji
)
->
addAward
:
(
emoji
)
->
emoji
=
@
normilizeEmojiName
(
emoji
)
emoji
=
@
normilizeEmojiName
(
emoji
)
...
...
features/steps/project/issues/award_emoji.rb
View file @
b80df087
...
@@ -96,6 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
...
@@ -96,6 +96,7 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
end
end
step
'The search field is focused'
do
step
'The search field is focused'
do
sleep
0.8
page
.
evaluate_script
(
"document.activeElement.id"
).
should
eq
"emoji_search"
page
.
evaluate_script
(
"document.activeElement.id"
).
should
eq
"emoji_search"
end
end
end
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