cck_forms 3.1.3 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5885969f4592d28cbe4d4d18cdf8b3cca99dbc50
-  data.tar.gz: e28ae670e596ba61fda2d37fef00f82ce55d0f4e
+  metadata.gz: 13d92b9f74221a1651abc8c15bfe35743bc11bd0
+  data.tar.gz: 643415c319917544c8902187f8bd007d083a53a8
 SHA512:
-  metadata.gz: 4d277ea14c0bfa3ab0fb220758845301c62878e8cc96f226b9c4bc2ee3d5a78bc2a8b7016d7ace1da5083b04f0dc24598b38b58db5399e1388aba53ae8e592cc
-  data.tar.gz: c3b13d9108fec8637998616cc8c798dc3e32c7d2af4932a946f4b1bfc5f471d15e22f8e7cfef721b913b7e32996ba2cf15cfa3f3d81802065a0ca5543b0eecfb
+  metadata.gz: 50a1ed167f097b57f7e94f1dc0dad6d4d2fa185d07f5fb458ae4edc8a39c3030542c2d0228a7973736671c5b596cdb9fd3a139bca7c737bc352cecc598b6ac67
+  data.tar.gz: f4220e7b29a787d7686733b531f8243b3219249a76bdbdb855ede70f676f59f91da253a60def0f4e2c107f997058ef927ecfce151d9d995df45fad73f1bb5038

data/README.md

@@ -238,6 +238,9 @@ config.cck_forms.phones.prefix = '+7'
 
 # the glue for concatenating phone number parts: 111[glue]22[glue]33
 config.cck_forms.phones.number_parts_glue = '-'
+
+# the default map provider; if not specified, google is the default
+config.cck_forms.maps.default_type = 'yandex'.freeze
 ```
 
 

data/lib/cck_forms/engine.rb

@@ -19,5 +19,8 @@ module CckForms
     config.cck_forms.phones.mobile_codes        = %w{ 777 705 771   701 702 775 778   700   707 }
     config.cck_forms.phones.prefix              = '+7'
     config.cck_forms.phones.number_parts_glue   = '-'
+
+    # maps
+    config.cck_forms.maps                       = ActiveSupport::OrderedOptions.new
   end
 end

data/lib/cck_forms/parameter_type_class/album.rb

@@ -95,9 +95,10 @@ HTML
   # Returns a collection of 64x64 IMGs
   def to_diff_value(options = {})
     view_context = options[:view_context]
-    images_html_list = []
-    value.each do |image_id|
-      images_html_list << "<img style='width: 64px; height: 64px;' src='#{view_context.neofiles_image_path(id: image_id, format: '64x64', crop: 1)}'>"
+
+    images_html_list = (value || []).map(&:presence).compact.map do
+      id = elem.is_a?(BSON::Document) ? elem['_id'] : elem
+      "<img style='width: 64px; height: 64px;' src='#{view_context.neofiles_image_path(id: id, format: '64x64', crop: 1)}'>"
     end
 
     images_html_list.join.html_safe if images_html_list.any?

data/lib/cck_forms/parameter_type_class/checkboxes.rb

@@ -28,10 +28,14 @@ class CckForms::ParameterTypeClass::Checkboxes
     value.present? or return {}
 
     valid_values = parameter_type_class.try!(:valid_values) || value.map { |x| [x, nil] }
-    valid_values.reduce({}) do |r, (key, _)|
+    valid_values = valid_values.reduce({}) do |r, (key, _)|
       r[key] = value.include?(key) ? '1' : '0'
       r
     end
+
+    valid_values    = valid_values.dup
+    priority_values = valid_values.extract!(*(value.respond_to?(:keys) ? value.keys : value))
+    priority_values.merge valid_values
   end
 
   # Comma-separated list of checked entries. Options:
@@ -150,33 +154,31 @@ class CckForms::ParameterTypeClass::Checkboxes
     set_value_in_hash options
     val = options[:value]
 
-    result = ''
-    if valid_values.is_a? Array
-      method = :each_with_index
-    elsif valid_values.is_a? Hash
-      method = :each_pair
-    end
-
-    valid_values.send(method) do |k, v|
-      if !options[:only] || options[:only] == k || options[:only].try(:include?, k)
-        result += form_builder.fields_for :value do |ff|
+    result          = ''
+    valid_values    = self.valid_values.dup
+    valid_values    = valid_values.is_a?(Hash) ? valid_values : valid_values.zip([])
+    priority_values = valid_values.extract!(*(value.respond_to?(:keys) ? value.keys : value))
 
-          begin
-            checked = ! val.try(:[], k).to_i.zero?
-          rescue
-            checked = false
-          end
+    priority_values.merge(valid_values).each_pair do |k, v|
+      next if options[:only] && options[:only] != k && !options[:only].try(:include?, k)
 
-          v = options[:map][v] || v
+      result += form_builder.fields_for :value do |ff|
 
-          # skip `required` since form will not be submitted unless a user checks all the checkboxes
-          data = options[:data] ? extract_data_for_key(k, options[:data]) : nil
-          sprintf(options[:block], ff.check_box(k.to_sym, {checked: checked}, '1', options[:for] == :search ? nil : '0'), ff.label(k.to_sym, v, data: data)).html_safe
+        begin
+          checked = !val.try(:[], k).to_i.zero?
+        rescue
+          checked = false
         end
+
+        v = options[:map][v] || v
+
+        # skip `required` since form will not be submitted unless a user checks all the checkboxes
+        data = options[:data] ? extract_data_for_key(k, options[:data]) : nil
+        sprintf(options[:block], ff.check_box(k.to_sym, {checked: checked}, '1', options[:for] == :search ? nil : '0'), ff.label(k.to_sym, v, data: data)).html_safe
       end
     end
 
-    result
+    sprintf '<div class="checkboxes" id="%1$s">%2$s</div><script type="text/javascript">$(function() {$("#%1$s").checkboxes()})</script>', form_builder_name_to_id(form_builder), result
   end
 
 

data/lib/cck_forms/parameter_type_class/image.rb

@@ -12,6 +12,10 @@ class CckForms::ParameterTypeClass::Image < CckForms::ParameterTypeClass::File
   # Returns a 64x64 IMG
   def to_diff_value(options = {})
     view_context = options[:view_context]
-    "<img style='width: 64px; height: 64px;' src='#{view_context.neofiles_image_path(id: value, format: '64x64', crop: 1)}'>".html_safe
+
+    if value.present?
+      id = value.is_a?(BSON::Document) ? value['_id'] : value
+      "<img style='width: 64px; height: 64px;' src='#{view_context.neofiles_image_path(id: id, format: '64x64', crop: 1)}'>".html_safe
+    end
   end
 end

data/lib/cck_forms/parameter_type_class/map.rb

@@ -5,7 +5,7 @@ class CckForms::ParameterTypeClass::Map
 
   MAP_TYPE_GOOGLE = 'google'.freeze
   MAP_TYPE_YANDEX = 'yandex'.freeze
-  DEFAULT_MAP_TYPE = MAP_TYPE_GOOGLE
+  DEFAULT_MAP_TYPE = Rails.application.config.cck_forms.maps.default_type || MAP_TYPE_GOOGLE
 
   mattr_accessor :map_providers
   @@map_providers = [MAP_TYPE_YANDEX, MAP_TYPE_GOOGLE]

data/lib/cck_forms/version.rb

@@ -1,3 +1,3 @@
 module CckForms
-  VERSION = '3.1.3'
+  VERSION = '3.2.2'
 end

data/vendor/assets/javascripts/cck_forms/index.js

@@ -1,2 +1,3 @@
+//= require ./jquery.checkboxes
 //= require ./jquery.workhours
-//= require ./map
+//= require ./map

data/vendor/assets/javascripts/cck_forms/jquery.checkboxes.coffee

@@ -0,0 +1,42 @@
+$ ->
+
+  #
+  # Helper widget to allow sorting of checkboxes, if jquery.sortable is available
+  #
+  $.widget "cck.checkboxes",
+    
+    _create: ->
+      @_checkBoxBlockSelector = ".form_check_box_block"
+
+      @_ensureSortableIsAvailable =>
+        @_initStickies()
+        @_bind()
+
+    _ensureSortableIsAvailable: (callback)->
+      callback() if $(document).sortable
+
+    _initStickies: ->
+      @element.find("input:checked").each (_i, checkbox)=>
+        $(checkbox).closest(@_checkBoxBlockSelector).addClass("sticky")
+
+      @element.sortable
+        items: ".sticky"
+
+    _bind: ->
+      @element.on "change", "#{@_checkBoxBlockSelector} input:checkbox", (e)=>
+        @_checkboxChange($(e.target))
+
+    _checkboxChange: ($checkbox)->
+      $container = $checkbox.closest(@_checkBoxBlockSelector)
+
+      $container.removeClass("sticky") unless $checkbox.is(":checked")
+
+      $lastSticky = @element.find(".sticky").last()
+
+      if $container.prev(@_checkBoxBlockSelector).get(0) != $lastSticky.get(0)
+        if $lastSticky.size() == 0
+          @element.prepend($container)
+        else
+          $container.insertAfter($lastSticky)
+
+      $container.addClass("sticky") if $checkbox.is(":checked")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.2
 platform: ruby
 authors:
 - Ilya Konanykhin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,7 @@ files:
 - lib/cck_forms/parameter_type_class/work_hours.rb
 - lib/cck_forms/version.rb
 - vendor/assets/javascripts/cck_forms/index.js
+- vendor/assets/javascripts/cck_forms/jquery.checkboxes.coffee
 - vendor/assets/javascripts/cck_forms/jquery.workhours.js
 - vendor/assets/javascripts/cck_forms/map.js.coffee
 homepage: http://github.com/ilya-konanykhin/cck_forms
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Content Construction Kit Forms