cck_forms 3.5.2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe742edab7f78446cf6b0b969966ce444a181a9ce5e9b50fefef89878759f23c
-  data.tar.gz: 9e6641bbb5aa51633e1c304cbabf997d98cc4557ed2ec9dc9aa05728176e92a6
+  metadata.gz: acb7223b683169514ba7fe62afb969cd6c26fe1afd4b013be5fca609ac4b0e21
+  data.tar.gz: 97990bd9deeeadb882db89fca09f24b592f86f91d1ed8e7ba7b07f2752938e7e
 SHA512:
-  metadata.gz: 9c92ba29ba8c1dbed71f7abeca21c5034ce795eb62db4a1f9d8d4ff4114d453f9210469d4e3bc58d8f546598f2f5da9542119ebc1870a6148f01e140a1d82299
-  data.tar.gz: b30f95baf9e27cf08c6211fae933ec145553f5904a4bcab6f6e3ffdc1b84dc591200068068a7c80e208806514221e60516a0c5f6d81ddb817d3b8935d1313444
+  metadata.gz: 2349f645a6ed49c8ea83b0a87844dbb8a6d10a3c63a738f65e3c754383720ecf39aace5e190d4f51b8fed3944f265c900ae70253fe2707581ece25511a8b91c5
+  data.tar.gz: bb0637b9720063cd402a32a520bb64e9bae258b920e7f638c533308a51afd735e0252e745bdf9506e1601df4ffdde8e59c36ad09ceff22a7e47f212b8c517c3b

data/lib/cck_forms/parameter_type_class/map.rb

@@ -187,7 +187,7 @@ class CckForms::ParameterTypeClass::Map
     switchers = []
     switchers << %Q|<div class="#{group_class} cck-map-switchers #{'hide' if allowed_maps.count < 2}" style="margin-top: 5px;">|
     allowed_maps.map do |map|
-      button_class = switcher_classes[map].presence || 'btn btn-default'
+      button_class = switcher_classes[map].presence || 'btn btn-default btn-secondary'
       button_class << ' active' if selected_map_type == map
       switchers << %Q|<a class="#{button_class}" href="#" data-map-type="#{map}">#{map_names[map]}</a>|
     end

data/lib/cck_forms/parameter_type_class/work_hours.rb

@@ -53,7 +53,7 @@ class CckForms::ParameterTypeClass::WorkHours
     met_days.reject! { |_, value| value }
 
     met_days.keys.each do |day_name|
-      form_builder.fields_for(:value, index: day_name) { |day_builder| result << CckForms::ParameterTypeClass::WorkHours::WorkHoursDay.new(day: day_name, open_24_hours: true).build_form(day_builder) }
+      form_builder.fields_for(:value, index: day_name) { |day_builder| result << CckForms::ParameterTypeClass::WorkHours::WorkHoursDay.new(day: day_name, open_24_hours: false).build_form(day_builder) }
     end
 
     form_builder.fields_for(:template) do |day_builder|

data/lib/cck_forms/version.rb

@@ -1,3 +1,3 @@
 module CckForms
-  VERSION = '3.5.2'
+  VERSION = '3.6.0'
 end

data/vendor/assets/javascripts/cck_forms/jquery.workhours.js

@@ -241,7 +241,11 @@ $(function() {
 
             // mark checkboxes
             for(var i = 0, ic = days.length; i < ic; ++ i) {
-                $newGroup.find("input[name$=\"[days]\"][value=" + days[i] + "]").prop("checked", true).closest(".nav-link").addClass("active");
+                $newGroup
+                  .find("input[name$=\"[days]\"][value=" + days[i] + "]")
+                  .prop("checked", true)
+                  .closest(".nav-link").addClass("active") // Bootstrap 4
+                  .closest(".nav-item").addClass("active");  // Bootstrap 3
             }
 
             // hide checkboxes, link-o-buttons will be in their place
@@ -289,7 +293,8 @@ $(function() {
                     this._days[dayName].workhoursday("value", $group.workhoursday("value"));
 
                     // mark the day as active
-                    input.parentNode.className += " active";
+                    input.parentNode.className += " active"; // Bootstrap 4
+                    input.parentNode.parentNode.className += " active"; // Bootstrap 3
 
                 } else {
 
@@ -300,7 +305,8 @@ $(function() {
                     if($group.find("input:checked[name$='[days]']").size() == 0) {
                         $group.remove();
                     } else {
-                        input.parentNode.className = input.parentNode.className.replace(/(^|\s)active($|\s)/, "$1");
+                        input.parentNode.className = input.parentNode.className.replace(/(^|\s)active($|\s)/, "$1"); // Bootstrap 4
+                        input.parentNode.parentNode.className = input.parentNode.parentNode.className.replace(/(^|\s)active($|\s)/, "$1"); // Bootstrap 3
                     }
                 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Ilya Konanykhin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails