cck_forms 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8014d2ff695301e74af0786d64e8c59d9b9028e4
-  data.tar.gz: c7f0347885e943b363c39784abcea19a17669c50
+  metadata.gz: dc4907e7cfc886d816dec72188a09782a95a913c
+  data.tar.gz: ed15ab4358fc8874951b68f1ede216bcdd6e49f7
 SHA512:
-  metadata.gz: 341cc155d587f187fb5c8dea78ca2f1316d04e7d8b5df9763f3b27e093cb8bc43cca209a99330549f5662d2f47603dedefc2aa70bc365ff16aca27c9bcddb5f2
-  data.tar.gz: 00058860396b4f8230ae17df449fbb1f47dad879ee5901d3d753444cefd4f06498bed9fce7aa952b08fa6b10811bb299638b0d0bfe7f6d11e3b70cd1797d01ea
+  metadata.gz: 866ef1e469bcc36f90de410af71954ccb004878eacdd557aaf6a54fe3f90f4b13a9d19cbcf792ee563dfafb9040bb8a765336f26c4ea07fd220fcf77a34e5e52
+  data.tar.gz: 449fc5a166723a8dafe444f9528db39b18492659317c16c645d163239f87be09e24f97c1d933c84c58a6982ef1a55caa790e6f0127f45aba62c75cbdd343ed74

data/lib/cck_forms/parameter_type_class/map.rb

@@ -174,14 +174,21 @@ class CckForms::ParameterTypeClass::Map
       inputs << value_builder.hidden_field(:type,      value: value['type'])
     end
 
-    allowed_maps = @@map_providers
-    map_names = {'google' => 'Google', 'yandex' => 'Yandex'}
+    allowed_maps      = @@map_providers
+    map_names         = {'google' => 'Google', 'yandex' => 'Yandex'}
     selected_map_type = value['type'].in?(allowed_maps) ? value['type'] : allowed_maps.first
+    group_class       = options[:group_class].presence  || 'btn-group'
+    switcher_classes  = {
+        'yandex' => options[:yandex_button_class],
+        'google' => options[:google_button_class]
+    }
 
     switchers = []
-    switchers << %Q|<div class="btn-group cck-map-switchers #{'hide' if allowed_maps.count < 2}" style="margin-top: 5px;">|
+    switchers << %Q|<div class="#{group_class} cck-map-switchers #{'hide' if allowed_maps.count < 2}" style="margin-top: 5px;">|
     allowed_maps.map do |map|
-      switchers << %Q|<a class="btn btn-default #{selected_map_type == map ? 'active' : nil}" href="#" data-map-type="#{map}">#{map_names[map]}</a>|
+      button_class = switcher_classes[map].presence || 'btn btn-default'
+      button_class << ' active' if selected_map_type == map
+      switchers << %Q|<a class="#{button_class}" href="#" data-map-type="#{map}">#{map_names[map]}</a>|
     end
     switchers << '</div>'
 

data/lib/cck_forms/parameter_type_class/phones.rb

@@ -79,6 +79,7 @@ class CckForms::ParameterTypeClass::Phones
     code_class    = options[:code_class].presence   || 'input-mini form-control'
     number_class  = options[:number_class].presence || 'input-small form-control'
     group_class   = options[:group_class].presence  || 'form-inline'
+    delimiter     = options[:delimiter].presence    || '—'
 
     phone_form = []
 
@@ -88,7 +89,9 @@ class CckForms::ParameterTypeClass::Phones
       phone_form << phone_builder.text_field(:number, class: number_class,  value: phone['number'])
     end
 
-    sprintf '<p class="%s">%s &mdash; %s &mdash; %s</p>', group_class, phone_form[0], phone_form[1], phone_form[2]
+    full_phone_form = [phone_form[0], delimiter, phone_form[1], delimiter, phone_form[2]].join
+
+    sprintf '<p class="%s">%s</p>', group_class, full_phone_form
   end
 
   # 1 empty phone Hash: {prefix: '+7', code: '', number: ''}

data/lib/cck_forms/version.rb

@@ -1,3 +1,3 @@
 module CckForms
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Ilya Konanykhin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails