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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
1b978727
Commit
1b978727
authored
Jan 29, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Auto-focus emoji award search field
Closes #12621
parent
f5860ce6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+1
-0
app/views/votes/_votes_block.html.haml
app/views/votes/_votes_block.html.haml
+1
-1
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
1b978727
...
@@ -4,6 +4,7 @@ class @AwardsHandler
...
@@ -4,6 +4,7 @@ class @AwardsHandler
event
.
stopPropagation
()
event
.
stopPropagation
()
event
.
preventDefault
()
event
.
preventDefault
()
$
(
".emoji-menu"
).
show
()
$
(
".emoji-menu"
).
show
()
$
(
"#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
...
...
app/views/votes/_votes_block.html.haml
View file @
1b978727
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-
if
current_user
-
if
current_user
.awards-controls
.awards-controls
%a
.add-award
{
"
data-toggle"
=>
"dropdown"
,
"data-target"
=>
"#"
,
"
href"
=>
"#"
}
%a
.add-award
{
"href"
=>
"#"
}
=
icon
(
'smile-o'
)
=
icon
(
'smile-o'
)
.emoji-menu
.emoji-menu
.emoji-menu-content
.emoji-menu-content
...
...
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