Commit 4caf38a1 authored by Phil Hughes's avatar Phil Hughes Committed by Fatih Acet

Refactored JS slightly to make things easier

# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/views/emoji_awards/_awards_block.html.haml
parent 6c89e2fd
class @AwardsHandler class @AwardsHandler
constructor: (@getEmojisUrl, @postEmojiUrl, @noteableType, @noteableId, @unicodes) -> constructor: (@aliases) ->
$('.js-add-award').on 'click', (event) => $(".js-add-award").on "click", (event) =>
event.stopPropagation() event.stopPropagation()
event.preventDefault() event.preventDefault()
@showEmojiMenu() @showEmojiMenu()
$('html').on 'click', (event) -> $("html").on 'click', (event) ->
if !$(event.target).closest('.emoji-menu').length if !$(event.target).closest(".emoji-menu").length
if $('.emoji-menu').is(':visible') if $(".emoji-menu").is(":visible")
$('.emoji-menu').removeClass 'is-visible' $(".emoji-menu").removeClass "is-visible"
$('.awards') $(".awards")
.off 'click' .off "click"
.on 'click', '.js-emoji-btn', @handleClick .on "click", ".js-emoji-btn", @handleClick
@renderFrequentlyUsedBlock() @renderFrequentlyUsedBlock()
handleClick: (e) -> handleClick: (e) ->
e.preventDefault() e.preventDefault()
emoji = $(this) $emojiBtn = $(e.currentTarget)
.find('.icon') awardUrl = $emojiBtn.closest('.js-votes-block').data 'award-url'
.data 'emoji' emoji = $emojiBtn
.find(".icon")
if emoji is 'thumbsup' and awardsHandler.didUserClickEmoji $(this), 'thumbsdown' .data "emoji"
awardsHandler.addAward 'thumbsdown' @addAward awardUrl, emoji
else if emoji is 'thumbsdown' and awardsHandler.didUserClickEmoji $(this), 'thumbsup'
awardsHandler.addAward 'thumbsup'
awardsHandler.addAward emoji
$(this).trigger 'blur'
didUserClickEmoji: (that, emoji) ->
if $(that).siblings("button:has([data-emoji=#{emoji}])").attr('data-original-title')
$(that).siblings("button:has([data-emoji=#{emoji}])").attr('data-original-title').indexOf('me') > -1
showEmojiMenu: -> showEmojiMenu: ->
if $('.emoji-menu').length if $(".emoji-menu").length
if $('.emoji-menu').is '.is-visible' if $(".emoji-menu").is ".is-visible"
$('.emoji-menu').removeClass 'is-visible' $(".emoji-menu").removeClass "is-visible"
$('#emoji_search').blur() $("#emoji_search").blur()
else else
$('.emoji-menu').addClass 'is-visible' $(".emoji-menu").addClass "is-visible"
$('#emoji_search').focus() $("#emoji_search").focus()
else else
$('.js-add-award').addClass 'is-loading' $('.js-add-award').addClass "is-loading"
$.get @getEmojisUrl, (response) => $.get "/emojis", (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 =>
$('.emoji-menu').addClass 'is-visible' $(".emoji-menu").addClass "is-visible"
$('#emoji_search').focus() $("#emoji_search").focus()
@setupSearch() @setupSearch()
, 200 , 200
addAward: (emoji) -> addAward: (awardUrl, emoji) ->
@postEmoji emoji, => emoji = @normilizeEmojiName(emoji)
@postEmoji awardUrl, emoji, =>
@addAwardToEmojiBar(emoji) @addAwardToEmojiBar(emoji)
$('.emoji-menu').removeClass 'is-visible' $(".emoji-menu").removeClass "is-visible"
addAwardToEmojiBar: (emoji) -> addAwardToEmojiBar: (emoji) ->
@addEmojiToFrequentlyUsedList(emoji) @addEmojiToFrequentlyUsedList(emoji)
emoji = @normilizeEmojiName(emoji)
if @exist(emoji) if @exist(emoji)
if @isActive(emoji) if @isActive(emoji)
@decrementCounter(emoji) @decrementCounter(emoji)
else else
counter = @findEmojiIcon(emoji).siblings('.js-counter') counter = @findEmojiIcon(emoji).siblings(".js-counter")
counter.text(parseInt(counter.text()) + 1) counter.text(parseInt(counter.text()) + 1)
counter.parent().addClass('active') counter.parent().addClass("active")
@addMeToAuthorList(emoji) @addMeToUserList(emoji)
else else
@createEmoji(emoji) @createEmoji(emoji)
...@@ -80,47 +71,47 @@ class @AwardsHandler ...@@ -80,47 +71,47 @@ class @AwardsHandler
@findEmojiIcon(emoji).length > 0 @findEmojiIcon(emoji).length > 0
isActive: (emoji) -> isActive: (emoji) ->
@findEmojiIcon(emoji).parent().hasClass('active') @findEmojiIcon(emoji).parent().hasClass("active")
decrementCounter: (emoji) -> decrementCounter: (emoji) ->
counter = @findEmojiIcon(emoji).siblings('.js-counter') counter = @findEmojiIcon(emoji).siblings(".js-counter")
emojiIcon = counter.parent() emojiIcon = counter.parent()
if parseInt(counter.text()) > 1 if parseInt(counter.text()) > 1
counter.text(parseInt(counter.text()) - 1) counter.text(parseInt(counter.text()) - 1)
emojiIcon.removeClass('active') emojiIcon.removeClass("active")
@removeMeFromAuthorList(emoji) @removeMeFromUserList(emoji)
else if emoji == 'thumbsup' || emoji == 'thumbsdown' else if emoji == "thumbsup" || emoji == "thumbsdown"
emojiIcon.tooltip('destroy') emojiIcon.tooltip("destroy")
counter.text(0) counter.text(0)
emojiIcon.removeClass('active') emojiIcon.removeClass("active")
@removeMeFromAuthorList(emoji) @removeMeFromUserList(emoji)
else else
emojiIcon.tooltip('destroy') emojiIcon.tooltip("destroy")
emojiIcon.remove() emojiIcon.remove()
removeMeFromAuthorList: (emoji) -> removeMeFromUserList: (emoji) ->
awardBlock = @findEmojiIcon(emoji).parent() award_block = @findEmojiIcon(emoji).parent()
authors = awardBlock authors = award_block
.attr('data-original-title') .attr("data-original-title")
.split(', ') .split(", ")
authors.splice(authors.indexOf('me'),1) authors.splice(authors.indexOf("me"),1)
awardBlock award_block
.closest('.js-emoji-btn') .closest(".js-emoji-btn")
.attr('data-original-title', authors.join(', ')) .attr("data-original-title", authors.join(", "))
@resetTooltip(awardBlock) @resetTooltip(award_block)
addMeToAuthorList: (emoji) -> addMeToUserList: (emoji) ->
awardBlock = @findEmojiIcon(emoji).parent() award_block = @findEmojiIcon(emoji).parent()
origTitle = awardBlock.attr('data-original-title').trim() origTitle = award_block.attr("data-original-title").trim()
authors = [] users = []
if origTitle if origTitle
authors = origTitle.split(', ') users = origTitle.split(', ')
authors.push('me') users.push("me")
awardBlock.attr('data-original-title', authors.join(', ')) award_block.attr("title", users.join(", "))
@resetTooltip(awardBlock) @resetTooltip(award_block)
resetTooltip: (award) -> resetTooltip: (award) ->
award.tooltip('destroy') award.tooltip("destroy")
# "destroy" call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout. # "destroy" call is asynchronous and there is no appropriate callback on it, this is why we need to set timeout.
setTimeout (-> setTimeout (->
...@@ -131,37 +122,30 @@ class @AwardsHandler ...@@ -131,37 +122,30 @@ class @AwardsHandler
createEmoji: (emoji) -> createEmoji: (emoji) ->
emojiCssClass = @resolveNameToCssClass(emoji) emojiCssClass = @resolveNameToCssClass(emoji)
nodes = [] buttonHtml = "<button class='btn award-control js-emoji-btn has-tooltip active' title='me'>
nodes.push( <div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>
"<button class='btn award-control js-emoji-btn has-tooltip active' data-original-title='me'>", <span class='award-control-text js-counter'>1</span>
"<div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>", </button>"
"<span class='award-control-text js-counter'>1</span>",
"</button>" emoji_node = $(buttonHtml)
) .insertBefore(".js-award-holder")
.find(".emoji-icon")
$(nodes.join("\n")) .data("emoji", emoji)
.insertBefore('.js-award-holder')
.find('.emoji-icon')
.data('emoji', emoji)
$('.award-control').tooltip() $('.award-control').tooltip()
resolveNameToCssClass: (emoji) -> resolveNameToCssClass: (emoji) ->
emojiIcon = $(".emoji-menu-content [data-emoji='#{emoji}']") emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
if emojiIcon.length > 0 if emoji_icon.length > 0
unicodeName = emojiIcon.data('unicode-name') unicodeName = emoji_icon.data("unicode-name")
else else
# Find by alias # Find by alias
unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data('unicode-name') unicodeName = $(".emoji-menu-content [data-aliases*=':#{emoji}:']").data("unicode-name")
"emoji-#{unicodeName}" "emoji-#{unicodeName}"
postEmoji: (emoji, callback) -> postEmoji: (awardUrl, emoji, callback) ->
$.post @postEmojiUrl, { note: { $.post awardUrl, { name: emoji }, (data) ->
note: ":#{emoji}:"
noteable_type: @noteableType
noteable_id: @noteableId
}},(data) ->
if data.ok if data.ok
callback.call() callback.call()
...@@ -173,43 +157,46 @@ class @AwardsHandler ...@@ -173,43 +157,46 @@ class @AwardsHandler
scrollTop: $('.awards').offset().top - 80 scrollTop: $('.awards').offset().top - 80
}, 200) }, 200)
normilizeEmojiName: (emoji) ->
@aliases[emoji] || emoji
addEmojiToFrequentlyUsedList: (emoji) -> addEmojiToFrequentlyUsedList: (emoji) ->
frequentlyUsedEmojis = @getFrequentlyUsedEmojis() frequently_used_emojis = @getFrequentlyUsedEmojis()
frequentlyUsedEmojis.push(emoji) frequently_used_emojis.push(emoji)
$.cookie('frequently_used_emojis', frequentlyUsedEmojis.join(','), { expires: 365 }) $.cookie('frequently_used_emojis', frequently_used_emojis.join(","), { expires: 365 })
getFrequentlyUsedEmojis: -> getFrequentlyUsedEmojis: ->
frequentlyUsedEmojis = ($.cookie('frequently_used_emojis') || '').split(',') frequently_used_emojis = ($.cookie('frequently_used_emojis') || "").split(",")
_.compact(_.uniq(frequentlyUsedEmojis)) _.compact(_.uniq(frequently_used_emojis))
renderFrequentlyUsedBlock: -> renderFrequentlyUsedBlock: ->
if $.cookie('frequently_used_emojis') if $.cookie('frequently_used_emojis')
frequentlyUsedEmojis = @getFrequentlyUsedEmojis() frequently_used_emojis = @getFrequentlyUsedEmojis()
ul = $('<ul>') ul = $("<ul>")
for emoji in frequentlyUsedEmojis for emoji in frequently_used_emojis
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)
$('input.emoji-search').after(ul).after($('<h5>').text('Frequently used')) $("input.emoji-search").after(ul).after($("<h5>").text("Frequently used"))
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
$('ul.emoji-menu-search, h5.emoji-search').remove() $("ul.emoji-menu-search, h5.emoji-search").remove()
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")
foundEmojis = @searchEmojis(term).show() found_emojis = @searchEmojis(term).show()
ul = $('<ul>').addClass('emoji-menu-list emoji-menu-search').append(foundEmojis) ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(found_emojis)
$('.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
$('.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()
.awards.votes-block.js-votes-block{ data: { award_url: url_for([:toggle_emoji_award, @project.namespace.becomes(Namespace), @project, awardable]) } }
- awards_sort(awardable.grouped_awards).each do |emoji, awards|
%button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), title: award_user_list(awards, current_user) }
= emoji_icon(emoji)
%span.award-control-text.js-counter
= awards.count
- if current_user
%div.award-menu-holder.js-award-holder
%button.btn.award-control.js-add-award{ type: "button" }
= icon('smile-o', {class: "award-control-icon"})
= icon('spinner spin', {class: "award-control-icon award-control-icon-loading"})
%span.award-control-text
Add
- if current_user
:javascript
var aliases = #{AwardEmoji.aliases.to_json};
window.awards_handler = new AwardsHandler(
aliases
);
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