Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix image upload in comments as well as preview #5321

Merged
merged 3 commits into from
Apr 1, 2019
Merged

Fix image upload in comments as well as preview #5321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45d73fa
Fix image upload in comments as well as preview
ViditChitkara Mar 31, 2019
def83b7
changes
ViditChitkara Mar 31, 2019
c2788cc
change
ViditChitkara Mar 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions app/assets/javascripts/dragdrop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ jQuery(document).ready(function() {
},
start: function(e) {

$('#create_progress').show()
$('#create_uploading').show()
$('#create_prompt').hide()
$('.dropzone').removeClass('hover');
($D.selected).find('#create_progress').eq(0).show();
($D.selected).find('#create_uploading').eq(0).show();
($D.selected).find('#create_prompt').eq(0).hide();
($D.selected).find('.dropzone').eq(0).removeClass('hover');
},
done: function (e, data) {
$('#create_progress').hide()
$('#create_uploading').hide()
$('#create_prompt').show()
($D.selected).find('#create_progress').hide();
($D.selected).find('#create_uploading').hide();
($D.selected).find('#create_prompt').show();
var extension = data.result['filename'].split('.')[data.result['filename'].split('.').length - 1]
var file_url = data.result.url.split('?')[0]

Expand Down Expand Up @@ -105,30 +105,29 @@ jQuery(document).ready(function() {
'nid':$D.nid
},
start: function(e) {
$('.side-dropzone').css('border-color','#ccc')
$('.side-dropzone').css('background','none')
$('#side-progress').show()
$('#side-dropzone').removeClass('hover');
$('.side-uploading').show()
($D.selected).find('.side-dropzone').eq(0).css('border-color','#ccc');
($D.selected).find('.side-dropzone').eq(0).css('background','none');
($D.selected).find('#side-progress').eq(0).show();
($D.selected).find('#side-dropzone').eq(0).removeClass('hover');
($D.selected).find('.side-uploading').eq(0).show();
},
done: function (e, data) {
$('#side-progress').hide()
$('#side-dropzone').show()
$('.side-uploading').hide()
$('#leadImage')[0].src = data.result.url
$('#leadImage').show()
($D.selected).find('#side-progress').eq(0).hide();
($D.selected).find('#side-dropzone').eq(0).show();
($D.selected).find('.side-uploading').eq(0).hide();
($D.selected).find('#leadImage')[0].src = data.result.url;
($D.selected).find('#leadImage').eq(0).show();
// here append the image id to the note as the lead image
$('#main_image').val(data.result.id)
$("#image_revision").append(
'<option selected="selected" id="'+data.result.id+'" value="'+data.result.url+'">Temp Image '+data.result.id+'</option>');
($D.selected).find('#main_image').eq(0).val(data.result.id);
($D.selected).find("#image_revision").append('<option selected="selected" id="'+data.result.id+'" value="'+data.result.url+'">Temp Image '+data.result.id+'</option>');
},

// see callbacks at https://github.com/blueimp/jQuery-File-Upload/wiki/Options
fileuploadfail: function(e,data) {
},
progressall: function (e, data) {
var progress = parseInt(data.loaded / data.total * 100, 10);
$('#side-progress .progress-bar').css(
($D.selected).find('#side-progress .progress-bar').eq(0).css(
'width',
progress + '%'
);
Expand Down
10 changes: 10 additions & 0 deletions app/assets/javascripts/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,18 @@ $E = {
is_editing: function() {
return ($E.textarea[0].selectionStart == 0 && $E.textarea[0].selectionEnd == 0)
},

refresh: function() {
if($D.selected) {
$E.textarea = ($D.selected).find('textarea').eq(0);
$E.preview = ($D.selected).find('#preview').eq(0);
$E.textarea.bind('input propertychange',$E.save);
}
},

// wraps currently selected text in textarea with strings a and b
wrap: function(a,b,args) {
this.refresh();
var len = $E.textarea.val().length;
var start = $E.textarea[0].selectionStart;
var end = $E.textarea[0].selectionEnd;
Expand Down
11 changes: 8 additions & 3 deletions app/views/comments/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div style="background-color:#f8f8f8; border: 1px solid #e7e7e7;padding: 18px;">
<div class="comment-form-wrapper" style="background-color:#f8f8f8; border: 1px solid #e7e7e7;padding: 18px;">
<form class="comment-form" id="comment-form" data-remote="true" class="well" <% if !local_assigns[:is_answer].blank? %> action= "/answers/create/<%= @node.nid %>" <% elsif !local_assigns[:aid].blank? %> action= "/comment/answer_create/<%= aid %>" <% else %> action="/comment/create/<%= @node.nid %><%= "?type=question" if local_assigns[:type]=="question" %>" <% end %> <% if local_assigns[:aid].blank? %>method="post"<% end %>>

<h4 style="margin-top:0;"><%= title %><% if current_user && current_user.id == @node.uid %> <small><a target="_blank" href="https://publiclab.org/comment-templates">Add a response template</a></small><% end %></h4>
Expand Down Expand Up @@ -46,7 +46,7 @@
<!-- http://stackoverflow.com/questions/11235206/twitter-bootstrap-form-file-element-upload-button -->
<label id="input_label" class="" for="fileinput">
<input id="fileinput" type="file" name="image[photo]" style="display:none;" />
<a class="hidden-xs">choose one</a>
<a onClick="handleClick()" class="hidden-xs">choose one</a>
<span class="visible-xs">
<i class="fa fa-upload"></i>
<a><%= t('comments._form.upload_image') %></a>
Expand All @@ -73,6 +73,11 @@
$('#input_label').click(function(e){
$E.initialize({});
});

function handleClick() {
$D.selected = $(event.target.closest('div.comment-form-wrapper'));
$E.refresh();
}
</script>

<%= javascript_include_tag "dragdrop" %>
Expand All @@ -91,7 +96,7 @@
</a>
<a class="btn btn-default" onClick="$('#c<%= comment.cid %>show').toggle();$('#c<%= comment.cid %>edit').toggle()"><%= t('comments._form.cancel') %></a>
<% else %>
<a class="btn btn-default preview-btn>" id="post_comment" data-previewing-text="Hide Preview" onClick="$E.toggle_preview('post_comment')"><%= t('comments._form.preview') %></a>
<a class="btn btn-default preview-btn>" id="post_comment" data-previewing-text="Hide Preview" onClick="handleClick();$E.toggle_preview()"><%= t('comments._form.preview') %></a>
<% end %>

<span style="color:#888;"> &nbsp;
Expand Down