cck_forms 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 879b5ac5dd9add74c06463c6ea0ea8d9ac919690
-  data.tar.gz: 1deecc0d0cb355f2b1ab22881ffea197ff920926
+  metadata.gz: 48d8cdb6dd4a8d35ee9b6af68d1739840506667f
+  data.tar.gz: f20ca16724e0f505b669ad67fb70334be39d8e79
 SHA512:
-  metadata.gz: e493ead26cdd54b827078bfdd6ac8c63446dfb1e9e80af6cf42b0f3607d2944101650764d130fd3c1a8c1ff8290051c0c841f015676fe4fc5eefe4d86888cddf
-  data.tar.gz: 28a00be50aaecd6165db9dbb3158a1971de0b74d30fe18c97b7fed33ff9e95cb7f527ae9e7bbdad8bd3808f4fc6d25f947fe9c02e83ca846c171e46c99ccf202
+  metadata.gz: da19c4c957d0e67c812be74d1d6281ddb0dcd134221768f2338f5db4ea919afc23aeb59aea6bfbcdd9d604ecb71c04e8f9f541fa85849663fdf45386dab5ca9b
+  data.tar.gz: 1fc9d3f7a8344ec24e3296cbe8db58acc0f2a9843edd22390a3ed4142193b4384eed2df2467dbfc1e0661333b4794ba82302fd12db29fffb6b351e71867f6f70

data/lib/cck_forms/parameter_type_class/album.rb

@@ -51,7 +51,7 @@ class CckForms::ParameterTypeClass::Album
 
     the_value.each do |image_id|
       image_id = image_id.is_a?(::Neofiles::File) ? image_id.id : image_id
-      file_forms << CckForms::ParameterTypeClass::Image.create_load_form( helper: self,
+      file_forms << cck_image_type.create_load_form( helper: self,
                                                                           file: image_id,
                                                                           input_name: input_name_prefix,
                                                                           append_create: false,
@@ -61,7 +61,7 @@ class CckForms::ParameterTypeClass::Album
                                                                           with_desc: options[:with_desc])
     end
 
-    add_file_form = CckForms::ParameterTypeClass::Image.create_load_form( helper: self,
+    add_file_form = cck_image_type.create_load_form( helper: self,
                                                                           file: nil,
                                                                           input_name: input_name_prefix,
                                                                           append_create: true,
@@ -86,6 +86,11 @@ class CckForms::ParameterTypeClass::Album
 HTML
   end
 
+  def cck_image_type
+    CckForms::ParameterTypeClass::Image
+  end
+
+
   # Returns empty string
   def to_s(options = nil)
     ''

data/lib/cck_forms/parameter_type_class/file.rb

@@ -62,12 +62,25 @@ class CckForms::ParameterTypeClass::File
       remove_temp_field = '$("#' + temp_id + '").remove();'
     end
 
+    file_attributes = {
+        id: file_id,
+        input_name: input_name,
+        widget_id: widget_id,
+        append_create: append_create ? '1' : nil,
+        clean_remove: clean_remove ? '1' : nil,
+        disabled: disabled ? '1' : nil,
+        multiple: multiple ? '1' : nil,
+        with_desc: with_desc ? '1' : nil
+    }
+
+    file_attributes.merge!(additional_file_attributes) if defined? additional_file_attributes
+
     '<div id="' + cont_id + '"></div>
     ' + temp_field + '
 
     <script type="text/javascript">
       $(function() {
-          $("#' + cont_id + '").load("' + helper.neofiles_file_compact_path(id: file_id, input_name: input_name, widget_id: widget_id, append_create: append_create ? '1' : nil, clean_remove: clean_remove ? '1' : nil, disabled: disabled ? '1' : nil, multiple: multiple ? '1' : nil, with_desc: with_desc ? '1' : nil) + '", null, function() {
+          $("#' + cont_id + '").load("' + helper.neofiles_file_compact_path(file_attributes) + '", null, function() {
               $(this).children().unwrap();
               ' + remove_temp_field + '
           });

data/lib/cck_forms/parameter_type_class/watermarkless_album.rb

@@ -0,0 +1,11 @@
+# Album without watermark. A subclass of Album.
+#
+class CckForms::ParameterTypeClass::WatermarklessAlbum < CckForms::ParameterTypeClass::Album
+  def self.name
+    'Альбом без водяного знака'
+  end
+
+  def cck_image_type
+    CckForms::ParameterTypeClass::WatermarklessImage
+  end
+end

data/lib/cck_forms/parameter_type_class/watermarkless_image.rb

@@ -0,0 +1,11 @@
+# Image without watermark. A subclass of Image.
+#
+class CckForms::ParameterTypeClass::WatermarklessImage < CckForms::ParameterTypeClass::Image
+  def self.name
+    'Картинка без водяного знака'
+  end
+
+  def self.additional_file_attributes
+    {no_wm: '1'}
+  end
+end

data/lib/cck_forms/version.rb

@@ -1,3 +1,3 @@
 module CckForms
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Ilya Konanykhin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,6 +86,8 @@ files:
 - lib/cck_forms/parameter_type_class/string_collection.rb
 - lib/cck_forms/parameter_type_class/text.rb
 - lib/cck_forms/parameter_type_class/time.rb
+- lib/cck_forms/parameter_type_class/watermarkless_album.rb
+- lib/cck_forms/parameter_type_class/watermarkless_image.rb
 - lib/cck_forms/parameter_type_class/work_hours.rb
 - lib/cck_forms/version.rb
 - vendor/assets/javascripts/cck_forms/index.js