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
iv
gitlab-ce
Commits
5da8c1f7
Commit
5da8c1f7
authored
Dec 24, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes after review
parent
694579ce
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+2
-2
app/assets/stylesheets/pages/awards.scss
app/assets/stylesheets/pages/awards.scss
+1
-1
app/assets/stylesheets/pages/emojis.scss
app/assets/stylesheets/pages/emojis.scss
+1
-1
app/views/votes/_votes_block.html.haml
app/views/votes/_votes_block.html.haml
+2
-2
features/project/issues/award_emoji.feature
features/project/issues/award_emoji.feature
+1
-1
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
5da8c1f7
...
@@ -118,7 +118,7 @@ class @AwardsHandler
...
@@ -118,7 +118,7 @@ class @AwardsHandler
@
aliases
[
emoji
]
||
emoji
@
aliases
[
emoji
]
||
emoji
setupSearch
:
->
setupSearch
:
->
$
(
"input.emoji-search"
).
keyup
(
ev
)
=>
$
(
"input.emoji-search"
).
keyup
(
ev
)
=>
term
=
$
(
ev
.
target
).
val
()
term
=
$
(
ev
.
target
).
val
()
# Clean previous search results
# Clean previous search results
...
@@ -135,4 +135,4 @@ class @AwardsHandler
...
@@ -135,4 +135,4 @@ class @AwardsHandler
$
(
".emoji-menu-content"
).
children
().
show
()
$
(
".emoji-menu-content"
).
children
().
show
()
searchEmojis
:
(
term
)
->
searchEmojis
:
(
term
)
->
$
(
".emoji-menu-content [data-emoji*='
"
+
term
+
"
']"
).
closest
(
"li"
).
clone
()
$
(
".emoji-menu-content [data-emoji*='
#{
term
}
']"
).
closest
(
"li"
).
clone
()
app/assets/stylesheets/pages/awards.scss
View file @
5da8c1f7
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
}
}
input
.emoji-search
{
input
.emoji-search
{
background
:
url(/assets/icon-search.png)
240px
no-repeat
;
background
:
image-
url
(
/
assets
/
icon-search
.
png
)
240px
no-repeat
;
}
}
li
{
li
{
...
...
app/assets/stylesheets/pages/emojis.scss
View file @
5da8c1f7
...
@@ -4,7 +4,7 @@ The source: gemojione gem.
...
@@ -4,7 +4,7 @@ The source: gemojione gem.
*/
*/
.emoji-icon
{
.emoji-icon
{
background-image
:
url(emoji.png)
;
background-image
:
image-
url
(
emoji
.
png
);
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
}
}
...
...
app/views/votes/_votes_block.html.haml
View file @
5da8c1f7
...
@@ -33,11 +33,11 @@
...
@@ -33,11 +33,11 @@
aliases
aliases
)
)
$(".awards").on "click", ".emoji-menu-content li", (e)->
$(".awards").on "click", ".emoji-menu-content li", (e)
->
emoji = $(this).find(".emoji-icon").data("emoji")
emoji = $(this).find(".emoji-icon").data("emoji")
awards_handler.addAward(emoji)
awards_handler.addAward(emoji)
$(".awards").on "click", ".award", (e)->
$(".awards").on "click", ".award", (e)
->
emoji = $(this).find(".icon").data("emoji")
emoji = $(this).find(".icon").data("emoji")
awards_handler.addAward(emoji)
awards_handler.addAward(emoji)
...
...
features/project/issues/award_emoji.feature
View file @
5da8c1f7
...
@@ -18,7 +18,7 @@ Feature: Award Emoji
...
@@ -18,7 +18,7 @@ Feature: Award Emoji
Given
I click to emoji-picker
Given
I click to emoji-picker
Then
I can see the activity and food categories
Then
I can see the activity and food categories
@javascript
@javascript
Scenario
:
I
can search emoji
Scenario
:
I
can search emoji
Given
I click to emoji-picker
Given
I click to emoji-picker
And
I search
"hand"
And
I search
"hand"
...
...
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