diff --git a/app/assets/javascripts/rails_admin/ra.jcrop.js b/app/assets/javascripts/rails_admin/ra.jcrop.js index 59f9971..ca8b059 100644 --- a/app/assets/javascripts/rails_admin/ra.jcrop.js +++ b/app/assets/javascripts/rails_admin/ra.jcrop.js @@ -51,7 +51,7 @@ bgColor: 'white', keySupport: false, onSelect: widget.updateCoordinates - }, rails_admin_jcrop_options); + }, widget.element.find(".toggle:eq(0)").data("jcropOptions")); dialog.find('img.jcrop-subject').Jcrop(jcrop_options) form.attr("data-remote", true); diff --git a/app/views/rails_admin/main/_form_jcrop.html.haml b/app/views/rails_admin/main/_form_jcrop.html.haml index 371313c..b612b16 100644 --- a/app/views/rails_admin/main/_form_jcrop.html.haml +++ b/app/views/rails_admin/main/_form_jcrop.html.haml @@ -1,13 +1,10 @@ -:javascript - var rails_admin_jcrop_options = #{field.jcrop_options.to_json}; - = stylesheet_link_tag 'rails_admin/jquery.Jcrop' = javascript_include_tag 'rails_admin/jquery.Jcrop' = javascript_include_tag 'rails_admin/ra.jcrop' - file = form.object.send(field.method_name).presence -.toggle{:style => ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')} +.toggle{:style => ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1'), :data => { :jcrop_options => field.jcrop_options.to_json } } - if value = field.pretty_value = value = form.file_field(field.name, field.html_attributes.reverse_merge({ :data => { :fileupload => true } }))