Fatih Acet
bcc3f8f237
Fix emoji block selector.
2016-06-11 00:24:24 +03:00
Fatih Acet
94826d9abe
Minor MR comment fixes.
...
yes -> true
no -> false
. frequent -> .frequent-emojis
2016-06-10 01:56:41 +03:00
Fatih Acet
e885c2fd31
Ignore frequent emojis in search.
2016-06-09 23:50:06 +03:00
Fatih Acet
92af60c244
Move award_menu_url variable into gon object.
2016-06-09 03:37:40 +03:00
Fatih Acet
52525dc4c2
Render frequent emoji block once.
2016-06-09 03:02:49 +03:00
Fatih Acet and Z.J. van de Weg
8dc1fa0d8d
Updated MR notes.
2016-06-06 16:02:11 +02:00
Fatih Acet and Z.J. van de Weg
c1e2b02e34
Added tests for award emoji feature.
2016-06-06 11:10:10 +02:00
Fatih Acet and Z.J. van de Weg
63a5402182
Create and show emoji loader on the fly.
2016-06-06 11:10:10 +02:00
Fatih Acet and Z.J. van de Weg
f1d74ccc8c
Some design related tweaks.
2016-06-06 11:10:10 +02:00
Fatih Acet and Z.J. van de Weg
47fc235fe1
Be consistent on naming.
...
It was named as $emojiBtn before I was using $emojiButton so updated them to be consistent.
2016-06-06 11:07:22 +02:00
Fatih Acet and Z.J. van de Weg
59b34188fa
Animate emoji when rendered.
2016-06-06 11:07:22 +02:00
Fatih Acet and Z.J. van de Weg
ce5729139f
Fix mutual exclusivity for emoji only comments.
2016-06-06 11:07:22 +02:00
Fatih Acet and Z.J. van de Weg
40c86c916e
Refactor awardsHandler methods to work with votesBlock.
2016-06-06 11:07:22 +02:00
Fatih Acet and Z.J. van de Weg
f261be0949
Award emoji implementation for notes.
2016-06-06 11:07:22 +02:00
Fatih Acet and Z.J. van de Weg
eaff5afc9b
Show emoji menu in notes.
2016-06-06 11:03:39 +02:00
Fatih Acet
9777a3d39d
Remove accidentally duplicated line.
...
🤦
2016-05-25 16:34:39 +03:00
Fatih Acet
c2bd71fda6
" ➡️ '.
2016-05-25 16:05:56 +03:00
Fatih Acet
20e6e0dbe6
Handle posting emoji only vote +1 and -1 comments.
...
And remove mutual votes.
2016-05-24 20:47:10 +03:00
Fatih Acet
b0082bec73
Get award menu url from gl object.
2016-05-24 19:34:08 +03:00
Fatih Acet
c697c9601d
Fix award tooltip after voting.
2016-05-24 03:44:19 +03:00
Fatih Acet
1d7c3c79b1
Handle thumbsup and thumbsdown mutuality.
2016-05-24 03:10:38 +03:00
Fatih Acet
85e9eece7e
Fix displaying emoji only comments.
...
To render emoji in the emoji bar of an issue or MR we actually need the emoji unicode and unicode info is stored in the emoji menu widget. That widget could only be visible if user clicks the "Add" button and there may not be a widget when posting emoji only comments. So this change will check existence of the widget and create it before posting the emoji if it's not exist to render it correctly.
2016-05-23 21:33:58 +03:00
Fatih Acet
e8c8c9d7b2
Fix emoji counter issue.
2016-05-23 21:25:45 +03:00
Phil Hughes and Fatih Acet
783a5ae98c
Adds the emoji menu to the body and then re-positions it depending on which button clicked
...
This spots bugs where the menu could be in a div that has overflow hidden on ie. diff comments
2016-05-19 14:13:16 -05:00
Phil Hughes and Fatih Acet
797acde046
Tooltip placement on award buttons
2016-05-19 14:12:59 -05:00
Phil Hughes and Fatih Acet
7d4f41efde
Removed console log
2016-05-19 14:11:27 -05:00
Phil Hughes and Fatih Acet
9e8449b1af
Hides the row in notes body when empty of emojis
2016-05-19 14:11:20 -05:00
Phil Hughes and Fatih Acet
25a4893215
Removes buttons in notes body
2016-05-19 14:11:10 -05:00
Phil Hughes and Fatih Acet
f2f2e07294
Shows the bar on notes if a new award is added
...
Correctly adds/removes awards in notes
# Conflicts:
# app/models/concerns/awardable.rb
# app/views/projects/issues/show.html.haml
# app/views/projects/merge_requests/_show.html.haml
2016-05-19 14:10:59 -05:00
Phil Hughes and Fatih Acet
0b45cf55dd
Uses the same emoji-menu and just moves it around depending where it should be viewed
...
# Conflicts:
# app/assets/javascripts/awards_handler.coffee
# app/assets/stylesheets/pages/notes.scss
# app/helpers/issues_helper.rb
# app/views/projects/notes/_note.html.haml
2016-05-19 14:07:27 -05:00
Phil Hughes and Fatih Acet
4caf38a1d5
Refactored JS slightly to make things easier
...
# Conflicts:
# app/assets/javascripts/awards_handler.coffee
# app/views/emoji_awards/_awards_block.html.haml
2016-05-19 14:04:48 -05:00
Zeger-Jan van de Weg
2bbe781d8b
revert front end changes
2016-05-11 22:58:01 +02:00
Zeger-Jan van de Weg
d8c27e4e2b
merge awards-handler.coffee from another branch
2016-05-11 22:33:27 +02:00
Zeger-Jan van de Weg
7e6dcf9cd0
Merge branch 'master' into awardables
2016-05-11 08:47:04 +02:00
Zeger-Jan van de Weg
dccf8a9fc8
Add tests on Awardables and Award Emoji
2016-05-10 12:03:13 +02:00
Arinde Eniola and Zeger-Jan van de Weg
4eb16290e4
move frontend logic from previous MR to new MR
2016-05-06 10:47:12 +02:00
Valery Sizov
311c859d11
awards_handler: single quotes
2016-04-26 11:53:56 +03:00
Valery Sizov
180c45b37e
AwardsHandler follows code style conventions
2016-04-26 11:25:58 +03:00
Jacob Schatz
8fc0eed357
Merge branch 'emoji-unicode-fix' into 'master'
...
Fixes issue with emoji comments not showing correct emoji image
Previously it would look for the unicode character inside the award menu. But this menu might not always be there.
Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character
Fixes #15512
See merge request !3885
2016-04-25 20:04:35 +00:00
Phil Hughes
13f7ba059e
Removed usage of normilizeEmojiName method
...
Fixed some Ruby based on feedback
2016-04-22 21:53:26 +01:00
Phil Hughes
319c936055
Fixes issue with emoji comments not showing correct emoji image
...
Previously it would look for the unicode character inside the award menu. But this menu might not always be there.
Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character
Fixes #15512
2016-04-22 17:01:53 +01:00
Phil Hughes
593f001453
Triggers blur after clicking award button
...
Fixes #15511
2016-04-22 14:38:29 +01:00
Arinde Eniola
b95c9217b7
prevent users from being able to both upvote and downvote
2016-04-09 23:31:45 +01:00
Sandra Freihofer
bb2214bd64
Fix award emoji picker for relative_url
...
MR !2888 caused a regression where the emoji picker does not load when
using relative_url, because the path for the controller was hardcoded.
2016-04-01 16:20:29 +02:00
Arinde Eniola
367818d293
change the css class has_tooltip to has-tooltip universally
2016-03-20 21:37:22 +01:00
Phil Hughes
25f392eab7
Added 'surprise' animation
2016-03-11 09:47:47 +00:00
Phil Hughes
57a9d07716
Fixed bug with emoji search styling
2016-03-11 09:11:36 +00:00
Phil Hughes
cb72f9b30c
CoffeeScript style improv.
2016-03-11 09:03:08 +00:00
Phil Hughes
b5f3cf8218
Moved method calls to separate lines
2016-03-11 09:03:08 +00:00
Phil Hughes
e3d844984b
Moved SCSS values into variables
2016-03-11 09:03:08 +00:00
Fatih Acet
Phil HughesandFatih Acet
Arinde EniolaandZeger-Jan van de Weg
Valery Sizov
Jacob Schatz
Sandra Freihofer