Commit 180c45b3 authored by Valery Sizov's avatar Valery Sizov

AwardsHandler follows code style conventions

parent 6ff740ff
class @AwardsHandler class @AwardsHandler
constructor: (@get_emojis_url, @post_emoji_url, @noteable_type, @noteable_id, @unicodes) -> constructor: (@getEmojisUrl, @postEmojiUrl, @noteableType, @noteableId, @unicodes) ->
$(".js-add-award").on "click", (event) => $(".js-add-award").on "click", (event) =>
event.stopPropagation() event.stopPropagation()
event.preventDefault() event.preventDefault()
...@@ -23,13 +23,13 @@ class @AwardsHandler ...@@ -23,13 +23,13 @@ class @AwardsHandler
.find(".icon") .find(".icon")
.data "emoji" .data "emoji"
if emoji is "thumbsup" and awards_handler.didUserClickEmoji $(this), "thumbsdown" if emoji is "thumbsup" and awardsHandler.didUserClickEmoji $(this), "thumbsdown"
awards_handler.addAward "thumbsdown" awardsHandler.addAward "thumbsdown"
else if emoji is "thumbsdown" and awards_handler.didUserClickEmoji $(this), "thumbsup" else if emoji is "thumbsdown" and awardsHandler.didUserClickEmoji $(this), "thumbsup"
awards_handler.addAward "thumbsup" awardsHandler.addAward "thumbsup"
awards_handler.addAward emoji awardsHandler.addAward emoji
$(this).trigger 'blur' $(this).trigger 'blur'
...@@ -47,7 +47,7 @@ class @AwardsHandler ...@@ -47,7 +47,7 @@ class @AwardsHandler
$("#emoji_search").focus() $("#emoji_search").focus()
else else
$('.js-add-award').addClass "is-loading" $('.js-add-award').addClass "is-loading"
$.get @get_emojis_url, (response) => $.get @getEmojisUrl, (response) =>
$('.js-add-award').removeClass "is-loading" $('.js-add-award').removeClass "is-loading"
$(".js-award-holder").append response $(".js-award-holder").append response
setTimeout => setTimeout =>
...@@ -99,25 +99,25 @@ class @AwardsHandler ...@@ -99,25 +99,25 @@ class @AwardsHandler
emojiIcon.remove() emojiIcon.remove()
removeMeFromAuthorList: (emoji) -> removeMeFromAuthorList: (emoji) ->
award_block = @findEmojiIcon(emoji).parent() awardBlock = @findEmojiIcon(emoji).parent()
authors = award_block authors = awardBlock
.attr("data-original-title") .attr("data-original-title")
.split(", ") .split(", ")
authors.splice(authors.indexOf("me"),1) authors.splice(authors.indexOf("me"),1)
award_block awardBlock
.closest(".js-emoji-btn") .closest(".js-emoji-btn")
.attr("data-original-title", authors.join(", ")) .attr("data-original-title", authors.join(", "))
@resetTooltip(award_block) @resetTooltip(awardBlock)
addMeToAuthorList: (emoji) -> addMeToAuthorList: (emoji) ->
award_block = @findEmojiIcon(emoji).parent() awardBlock = @findEmojiIcon(emoji).parent()
origTitle = award_block.attr("data-original-title").trim() origTitle = awardBlock.attr("data-original-title").trim()
authors = [] authors = []
if origTitle if origTitle
authors = origTitle.split(', ') authors = origTitle.split(', ')
authors.push("me") authors.push("me")
award_block.attr("data-original-title", authors.join(", ")) awardBlock.attr("data-original-title", authors.join(", "))
@resetTooltip(award_block) @resetTooltip(awardBlock)
resetTooltip: (award) -> resetTooltip: (award) ->
award.tooltip("destroy") award.tooltip("destroy")
...@@ -139,20 +139,28 @@ class @AwardsHandler ...@@ -139,20 +139,28 @@ class @AwardsHandler
"</button>" "</button>"
) )
emoji_node = $(nodes.join("\n")) $(nodes.join("\n"))
.insertBefore(".js-award-holder") .insertBefore(".js-award-holder")
.find(".emoji-icon") .find(".emoji-icon")
.data("emoji", emoji) .data("emoji", emoji)
$('.award-control').tooltip() $('.award-control').tooltip()
resolveNameToCssClass: (emoji) -> resolveNameToCssClass: (emoji) ->
"emoji-#{@unicodes[emoji]}" emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
if emoji_icon.length > 0
unicodeName = emoji_icon.data('unicode-name')
else
# Find by alias
unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data('unicode-name')
"emoji-#{unicodeName}"
postEmoji: (emoji, callback) -> postEmoji: (emoji, callback) ->
$.post @post_emoji_url, { note: { $.post @postEmojiUrl, { note: {
note: ":#{emoji}:" note: ":#{emoji}:"
noteable_type: @noteable_type noteable_type: @noteableType
noteable_id: @noteable_id noteable_id: @noteableId
}},(data) -> }},(data) ->
if data.ok if data.ok
callback.call() callback.call()
...@@ -166,21 +174,21 @@ class @AwardsHandler ...@@ -166,21 +174,21 @@ class @AwardsHandler
}, 200) }, 200)
addEmojiToFrequentlyUsedList: (emoji) -> addEmojiToFrequentlyUsedList: (emoji) ->
frequently_used_emojis = @getFrequentlyUsedEmojis() frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
frequently_used_emojis.push(emoji) frequentlyUsedEmojis.push(emoji)
$.cookie('frequently_used_emojis', frequently_used_emojis.join(","), { expires: 365 }) $.cookie('frequently_used_emojis', frequentlyUsedEmojis.join(","), { expires: 365 })
getFrequentlyUsedEmojis: -> getFrequentlyUsedEmojis: ->
frequently_used_emojis = ($.cookie('frequently_used_emojis') || "").split(",") frequentlyUsedEmojis = ($.cookie('frequently_used_emojis') || "").split(",")
_.compact(_.uniq(frequently_used_emojis)) _.compact(_.uniq(frequentlyUsedEmojis))
renderFrequentlyUsedBlock: -> renderFrequentlyUsedBlock: ->
if $.cookie('frequently_used_emojis') if $.cookie('frequently_used_emojis')
frequently_used_emojis = @getFrequentlyUsedEmojis() frequentlyUsedEmojis = @getFrequentlyUsedEmojis()
ul = $("<ul>") ul = $("<ul>")
for emoji in frequently_used_emojis for emoji in frequentlyUsedEmojis
do (emoji) -> do (emoji) ->
$(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul) $(".emoji-menu-content [data-emoji='#{emoji}']").closest("li").clone().appendTo(ul)
...@@ -196,8 +204,8 @@ class @AwardsHandler ...@@ -196,8 +204,8 @@ class @AwardsHandler
if term if term
# Generate a search result block # Generate a search result block
h5 = $("<h5>").text("Search results").addClass("emoji-search") h5 = $("<h5>").text("Search results").addClass("emoji-search")
found_emojis = @searchEmojis(term).show() foundEmojis = @searchEmojis(term).show()
ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(found_emojis) ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(foundEmojis)
$(".emoji-menu-content ul, .emoji-menu-content h5").hide() $(".emoji-menu-content ul, .emoji-menu-content h5").hide()
$(".emoji-menu-content").append(h5).append(ul) $(".emoji-menu-content").append(h5).append(ul)
else else
......
...@@ -167,8 +167,8 @@ class @Notes ...@@ -167,8 +167,8 @@ class @Notes
return return
if note.award if note.award
awards_handler.addAwardToEmojiBar(note.note) awardsHandler.addAwardToEmojiBar(note.note)
awards_handler.scrollToAwards() awardsHandler.scrollToAwards()
# render note if it not present in loaded list # render note if it not present in loaded list
# or skip if rendered # or skip if rendered
...@@ -373,11 +373,11 @@ class @Notes ...@@ -373,11 +373,11 @@ class @Notes
new GLForm form new GLForm form
if scrollTo? and myLastNote? if scrollTo? and myLastNote?
# scroll to the bottom # scroll to the bottom
# so the open of the last element doesn't make a jump # so the open of the last element doesn't make a jump
$('html, body').scrollTop($(document).height()); $('html, body').scrollTop($(document).height());
$('html, body').animate({ $('html, body').animate({
scrollTop: myLastNote.offset().top - 150 scrollTop: myLastNote.offset().top - 150
}, 500, -> }, 500, ->
$noteText = form.find(".js-note-text") $noteText = form.find(".js-note-text")
$noteText.focus() $noteText.focus()
......
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
- if current_user - if current_user
:javascript :javascript
var get_emojis_url = "#{emojis_path}"; var getEmojisUrl = "#{emojis_path}";
var post_emoji_url = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}"; var postEmojiUrl = "#{award_toggle_namespace_project_notes_path(@project.namespace, @project)}";
var noteable_type = "#{votable.class.name.underscore}"; var noteableType = "#{votable.class.name.underscore}";
var noteable_id = "#{votable.id}"; var noteableId = "#{votable.id}";
var unicodes = #{AwardEmoji.unicode.to_json}; var unicodes = #{AwardEmoji.unicode.to_json};
window.awards_handler = new AwardsHandler( window.awardsHandler = new AwardsHandler(
get_emojis_url, getEmojisUrl,
post_emoji_url, postEmojiUrl,
noteable_type, noteableType,
noteable_id, noteableId,
unicodes unicodes
); );
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment