kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Show emoji menu in notes.

Browse source
This commit is contained in:
Fatih Acet 2016-05-26 12:15:20 +03:00 committed by Z.J. van de Weg
parent 2f9c2149a3
commit eaff5afc9b
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/awards_handler.coffee
View file

@ -51,7 +51,7 @@ class @AwardsHandler
$('#emoji_search').focus() $('#emoji_search').focus()
else else
$addBtn.addClass 'is-loading is-active' $addBtn.addClass 'is-loading is-active'
url = $addBtn.data 'award-menu-url' url = @getAwardMenuUrl()
@createEmojiMenu url, => @createEmojiMenu url, =>
$addBtn.removeClass 'is-loading' $addBtn.removeClass 'is-loading'
@ -74,6 +74,7 @@ class @AwardsHandler
positionMenu: ($menu, $addBtn) -> positionMenu: ($menu, $addBtn) ->
position = $addBtn.data('position') position = $addBtn.data('position')
# The menu could potentially be off-screen or in a hidden overflow element # The menu could potentially be off-screen or in a hidden overflow element
@ -240,8 +241,10 @@ class @AwardsHandler
return @createEmoji_ emoji if $('.emoji-menu').length return @createEmoji_ emoji if $('.emoji-menu').length
awardMenuUrl = gl.awardMenuUrl or '/emojis' @createEmojiMenu @getAwardMenuUrl(), => @createEmoji emoji
@createEmojiMenu awardMenuUrl, => @createEmoji emoji
getAwardMenuUrl: -> return gl.awardMenuUrl or '/emojis'
resolveNameToCssClass: (emoji) -> resolveNameToCssClass: (emoji) ->

16
app/assets/stylesheets/pages/notes.scss
View file

@ -120,6 +120,22 @@ ul.notes {
padding-bottom: 3px; padding-bottom: 3px;
} }
.note-emoji-button {
.fa-spinner {
display: none;
}
&.is-loading {
.fa-smile-o {
display: none;
}
.fa-spinner {
display: inline-block;
}
}
}
} }
} }

3
app/views/projects/notes/_note.html.haml
View file

@ -22,6 +22,9 @@
%span.note-role %span.note-role
= access = access
- if note_editable - if note_editable
= link_to '#', title: 'Add Reaction', class: 'note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do
= icon('spinner spin')
= icon('smile-o')
= link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
= icon('pencil') = icon('pencil')
= link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do