From 54068ce7cbdbebcb4bb148d2049ed152cb96500f Mon Sep 17 00:00:00 2001 From: iagirre Date: Fri, 13 Oct 2017 14:35:14 +0200 Subject: [PATCH] When answer 2 more info expand is clicked, it expands on top of the first one, not below. Same if the expand is clicked for the first answer --- app/assets/javascripts/polls.js.coffee | 16 ++++++++++++++++ app/views/polls/show.html.erb | 3 +-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/polls.js.coffee b/app/assets/javascripts/polls.js.coffee index 5cf792ce2..ac2c759ba 100644 --- a/app/assets/javascripts/polls.js.coffee +++ b/app/assets/javascripts/polls.js.coffee @@ -26,3 +26,19 @@ App.Polls = token_message.html(token_message.html() + "
" + @token + ""); token_message.show() false + + $(".zoom-link").on "click", (event) -> + element = event.target + answer = $(element).closest('div.answer') + + if $(answer).hasClass('medium-6') + $(answer).removeClass("medium-6"); + $(answer).addClass("answer-divider"); + unless $(answer).hasClass('first') + $(answer).insertBefore($(answer).prev('div.answer')); + else + $(answer).addClass("medium-6"); + $(answer).removeClass("answer-divider"); + unless $(answer).hasClass('first') + $(answer).insertAfter($(answer).next('div.answer')); + diff --git a/app/views/polls/show.html.erb b/app/views/polls/show.html.erb index d9d871249..f66973acd 100644 --- a/app/views/polls/show.html.erb +++ b/app/views/polls/show.html.erb @@ -80,8 +80,7 @@
<% @poll.questions.map(&:question_answers).flatten.each do |answer| %> -
+
<% if answer.description.present? %>

<%= answer.title %>