ack_rails_admin_jcrop 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e72edc6e6ed63c6cd118009e26c277dac8fe6c
-  data.tar.gz: 966e0bc8e5c40c4ec6b45412cd0039b66d48e6eb
+  metadata.gz: e6be68f7add71d4fa568ceaade4035e7422e705a
+  data.tar.gz: fa922ff3e42d6bf637ab383c7520b483745b398a
 SHA512:
-  metadata.gz: ca19b55f93ff61844c28db8f8d62e2151e74b9724af7f407cbbc3127488ac4850c7f5c730ec1fd5c2071cc4976e1ace2fa97e57dd8cda9f33791c229cfe38ca9
-  data.tar.gz: 47905ee8778fdd1bb5d6a0924c7d422d6c80081b21606ae2bdc3df60526ba7f98f12ba2008efde6961dad1ebbfafff7313cc72fd1ca610a98ee016fb3d57cfc3
+  metadata.gz: 88b8d78a2f9271f0d28c40f9a6d59dd155ef770cb7438de716b74f6e98abb7e30ea7b864596a529c16e892b1b04ff86e06093271fea367fe59e4e4c2d1a63402
+  data.tar.gz: 95a535e8ecd264493415a8b5eefb41b67a1e28319232c71d3915a049cc5beedd59507ca644c1ecc6b900826e7bf81eea3d282b670ab8d7bf277006b5f70cec48

data/app/assets/javascripts/rails_admin/ra.jcrop.js

@@ -5,11 +5,37 @@
       var widget = this;
       var dom_widget = widget.element;
 
-      var thumbnailLink = dom_widget.find('.jcrop_data_value');
+      var thumbnailLink = dom_widget.find('.jcrop_data_value .preview');
       thumbnailLink.unbind().bind("click", function(e){
         widget._bindModalOpening(e, dom_widget.find('a.jcrop_handle').data('link'));
         return false;
       });
+      dom_widget.find('[data-fileupload]').unbind("change").bind("change", function() {
+        var input = this;
+        var image_container = $("#" + input.id).parent().children(".preview");
+        if (image_container.length > 0) {
+          if (image_container[0].tagName != "img") {
+            image_container.parent().removeClass("jcrop_data_value");
+            image_container.remove();
+          }
+          image_container = $("#" + input.id).parent().children(".preview");
+        }
+        if (image_container.length == 0) {
+          image_container = $("#" + input.id).parent().prepend($('<img />').addClass('preview')).find('img.preview');
+          image_container.parent().find('img:not(.preview)').hide();
+          ext = $("#" + input.id).val().split('.').pop().toLowerCase();
+        }
+        if (input.files && input.files[0] && $.inArray(ext, ['gif', 'png', 'jpg', 'jpeg', 'bmp']) != -1) {
+          reader = new FileReader();
+          reader.onload = function (e) {
+            image_container.attr("src", e.target.result);
+          };
+          reader.readAsDataURL(input.files[0]);
+          image_container.show();
+        } else {
+          image_container.hide();
+        }
+      })
     },
 
     _bindModalOpening: function(e, url) {
@@ -49,6 +75,7 @@
 
       var jcrop_options = $.extend({
         bgColor: 'white',
+        bgOpacity: 0.4,
         keySupport: false,
         onSelect: widget.updateCoordinates
       }, widget.element.find('input[data-rails-admin-jcrop-options]').data('rails-admin-jcrop-options'));
@@ -130,7 +157,7 @@
             show: true
           })
           .on('hidden.bs.modal', function(){
-            $(document).unbind("keyup")
+            $(document).unbind("keyup");
             widget.dialog.remove();   // We don't want to reuse closed modals
             widget.dialog = null;
           });

data/app/assets/stylesheets/rails_admin/ra.jcrop.sass

@@ -1,11 +1,13 @@
 .jcrop_data_value
   cursor: pointer
   display: inline-block
-  &:hover
-    font-weight: bold
-  &:active
-    .title_link_hint
-      color: black
+  .preview
+    &:hover
+      .title_link_hint
+        font-weight: bold
+    &:active
+      .title_link_hint
+        color: black
   .title_link_hint
     color: blue
     display: inline-block
@@ -18,3 +20,7 @@
 
 .jcrop-holder, .jcrop-subject
   max-width: 960px !important
+
+.jcrop-holder
+  border: 1px solid black
+  margin: 0px auto

data/app/views/rails_admin/main/_form_jcrop.html.slim

@@ -14,11 +14,12 @@
 
 - file = form.object.send(field.method_name).presence
 
-.toggle{style=('display:none;' if file and field.delete_method and form.object.send(field.delete_method) == '1')}
+- _add_class = field.pretty_value ? "jcrop_data_value" : ""
+.toggle{class="#{_add_class}" style=('display:none;' if file and field.delete_method and form.object.send(field.delete_method) == '1')}
   - if value = field.pretty_value
-    .jcrop_data_value
+    .preview
       .title_link_hint= "Обрезать"
-      div
+      .image_block
         = value
   = form.file_field(field.name, field.html_attributes.reverse_merge({data: {fileupload: true, rails_admin_jcrop_options: rails_admin_jcrop_options } }))
 

data/lib/rails_admin_jcrop/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminJcrop
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rails_admin_jcrop
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - ack43
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails