consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Complete create comment details

Browse Source
This commit is contained in:
Fernando Blat
2017-01-14 16:06:45 +01:00
parent f47cef5a93
commit 046c021c0c
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/assets/javascripts/legislation_annotatable.js.coffee
View File

@@ -17,8 +17,6 @@ App.LegislationAnnotatable =
return
highlight: (colour) ->
range = undefined
sel = undefined
if window.getSelection
# IE9 and non-IE
try
@@ -39,7 +37,7 @@ App.LegislationAnnotatable =
return
renderAnnotationComments: (event) ->
$('.comment-box').offset(top: event.offset)
$('#comments-box').css({top: event.offset - $('.calc-comments').offset().top})
$.ajax
method: "GET"
url: event.annotation_url + "/annotations/" + event.annotation_id + "/comments"
@@ -75,18 +73,23 @@ App.LegislationAnnotatable =
dataType: 'script').done (->
$('#new_legislation_annotation #legislation_annotation_quote').val(@annotation.quote)
$('#new_legislation_annotation #legislation_annotation_ranges').val(JSON.stringify(@annotation.ranges))
$('#comments-box').css({top: $('.annotator-adder').position().top})
$('#comments-box').css({top: position.top - $('.calc-comments').offset().top})
App.LegislationAnnotatable.highlight('#7fff9a')
$('#comments-box textarea').focus()
$("#new_legislation_annotation").on("ajax:complete", (e, data, status, xhr) ->
App.LegislationAnnotatable.remove_highlight()
$("#comments-box").html("").hide();
if data.status == 200
App.LegislationAnnotatable.remove_highlight()
$("#comments-box").html("").hide()
$.ajax
method: "GET"
url: annotation_url + "/annotations/" + data.responseJSON.id + "/comments"
dataType: 'script'
else
$(e.target).find('label').addClass('error')
$('<small class="error">' + data.responseJSON[0] + '</small>').insertAfter($(e.target).find('textarea'))
return true
).on("ajax:error", (e, data, status, xhr) ->
console.log(data)
return false
)
return
).bind(this)
@@ -108,9 +111,9 @@ App.LegislationAnnotatable =
offset: el.offset()["top"]
initialize: ->
$(document).on("renderLegislationAnnotation", App.LegislationAnnotatable.renderAnnotationComments)
$(document).on('click', '[data-annotation-id]', App.LegislationAnnotatable.onClick)
$(document).on('click', '[data-cancel-annotation]', (e) ->
$(document).off("renderLegislationAnnotation").on("renderLegislationAnnotation", App.LegislationAnnotatable.renderAnnotationComments)
$(document).off('click', '[data-annotation-id]').on('click', '[data-annotation-id]', App.LegislationAnnotatable.onClick)
$(document).off('click', '[data-cancel-annotation]').on('click', '[data-cancel-annotation]', (e) ->
e.preventDefault()
$('#comments-box').html('')
$('#comments-box').hide()

24
app/views/legislation/annotations/_form.html.erb
View File

@@ -8,16 +8,24 @@
<div class="comments-wrapper">
<div class="comment-input">
<%= form_for Legislation::Annotation.new, url: legislation_process_draft_version_annotations_path(@process, @draft_version), remote: true do |f| %>
<%= f.text_area :text %>
<% if user_signed_in? %>
<%= form_for Legislation::Annotation.new, url: legislation_process_draft_version_annotations_path(@process, @draft_version), remote: true do |f| %>
<%= f.text_area :text %>
<div class="comment-actions">
<a class="cancel-comment" href="#" data-cancel-annotation><%= t('legislation.annotations.comments.cancel') %></a>
<%= f.submit t('legislation.annotations.comments.publish_comment'), class: 'button strong publish-comment' %>
</div>
<div class="comment-actions">
<a class="cancel-comment" href="#" data-cancel-annotation><%= t('legislation.annotations.comments.cancel') %></a>
<%= f.submit t('legislation.annotations.comments.publish_comment'), class: 'button strong publish-comment' %>
</div>
<%= f.hidden_field :quote %>
<%= f.hidden_field :ranges %>
<%= f.hidden_field :quote %>
<%= f.hidden_field :ranges %>
<% end %>
<% else %>
<div data-alert class="callout primary">
<%= t("debates.show.login_to_comment",
signin: link_to(t("votes.signin"), new_user_session_path),
signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
</div>
<% end %>
</div>
</div>

2
app/views/legislation/annotations/comments.js.erb
View File

@@ -1,2 +1,2 @@
$("#comments-box").html("<%= j render('comments_box', annotation: @annotation) %>");
$("#comments-box").html("<%= j render('comments_box', annotation: @annotation) %>").show();