cck_forms 3.4.5 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 82b928a29e03d7eafdb3c427bad988484b0d7503
-  data.tar.gz: c0c74ce03ee74651f7b16fbf9d00822a18e6ef92
+SHA256:
+  metadata.gz: fe742edab7f78446cf6b0b969966ce444a181a9ce5e9b50fefef89878759f23c
+  data.tar.gz: 9e6641bbb5aa51633e1c304cbabf997d98cc4557ed2ec9dc9aa05728176e92a6
 SHA512:
-  metadata.gz: 1efef4474a50e3aa894dafec55577eaeb5a5763081d8cfb373dd60a63fb02016b06bf2a8e4f635796ab8a8ae8a6c47a191b7d3f698941eaf6b160c04a2cfbf15
-  data.tar.gz: b9867a4e7bf158ab0d46d986c56858d139b27c8ee0d250919bd81b3049ff2370ab9cf1f8a8644a6985a2683e40a0ba4a700a48f9f55914bdc382724fc891d016
+  metadata.gz: 9c92ba29ba8c1dbed71f7abeca21c5034ce795eb62db4a1f9d8d4ff4114d453f9210469d4e3bc58d8f546598f2f5da9542119ebc1870a6148f01e140a1d82299
+  data.tar.gz: b30f95baf9e27cf08c6211fae933ec145553f5904a4bcab6f6e3ffdc1b84dc591200068068a7c80e208806514221e60516a0c5f6d81ddb817d3b8935d1313444

data/lib/cck_forms/parameter_type_class/map.rb

@@ -11,6 +11,7 @@ class CckForms::ParameterTypeClass::Map
   @@map_providers = [MAP_TYPE_YANDEX, MAP_TYPE_GOOGLE]
 
   mattr_accessor :google_maps_api_key
+  mattr_accessor :yandex_maps_api_key
 
   # In MongoDB: {latlon: [x, y], zoom: z}
   #
@@ -197,7 +198,8 @@ class CckForms::ParameterTypeClass::Map
       map_html_containers.push %Q|<div id="#{id}_#{map}" data-id=#{id} class="map_widget" style="display: none; width: #{options[:width]}px; height: #{options[:height]}px"></div>|
     end
 
-    api_key = @@google_maps_api_key.present? ? "&key=#{@@google_maps_api_key}" : nil
+    google_api_key = @@google_maps_api_key.present? ? "&key=#{@@google_maps_api_key}" : nil
+    yandex_api_key = @@yandex_maps_api_key.present? ? "&apikey=#{@@yandex_maps_api_key}" : nil
 
     %Q|
     <div class="map-canvas">
@@ -218,12 +220,12 @@ class CckForms::ParameterTypeClass::Map
         var script;
         script = document.createElement('script');
         script.type = 'text/javascript';
-        script.src = 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&callback=googleMapReady#{api_key}';
+        script.src = 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&callback=googleMapReady#{google_api_key}';
         document.body.appendChild(script);
 
         script = document.createElement('script');
         script.type = 'text/javascript';
-        script.src = 'https://api-maps.yandex.ru/2.0/?coordorder=longlat&load=package.full&wizard=constructor&lang=ru-RU&onload=yandexMapReady';
+        script.src = 'https://api-maps.yandex.ru/2.0/?coordorder=longlat&load=package.full&wizard=constructor&lang=ru-RU&onload=yandexMapReady#{yandex_api_key}';
         document.body.appendChild(script);
       }
 

data/lib/cck_forms/parameter_type_class/work_hours.rb

@@ -218,7 +218,7 @@ class CckForms::ParameterTypeClass::WorkHours
 
       if template
         header = ['<ul class="nav nav-pills">']
-        CckForms::ParameterTypeClass::WorkHours::DAYS.each { |day| header << '<li><a href="javascript:void(0)"><input name="' + form_builder.object_name + '[days]" type="checkbox" value="' + day + '" /> ' + CckForms::ParameterTypeClass::WorkHours.day_to_short(day) + '</a></li>' }
+        CckForms::ParameterTypeClass::WorkHours::DAYS.each { |day| header << '<li class="nav-item"><a class="nav-link" href="javascript:void(0)"><input name="' + form_builder.object_name + '[days]" type="checkbox" value="' + day + '" /> ' + CckForms::ParameterTypeClass::WorkHours.day_to_short(day) + '</a></li>' }
         header = header.push('</ul>').join
       else
         header = sprintf '<strong>%s</strong>:%s', CckForms::ParameterTypeClass::WorkHours::day_to_short(day), form_builder.hidden_field(:day)

data/lib/cck_forms/version.rb

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

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

@@ -0,0 +1,3 @@
+import './jquery.checkboxes';
+import './jquery.workhours';
+import './map.js';

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

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

data/vendor/assets/javascripts/cck_forms/map.js.coffee

@@ -35,12 +35,12 @@ class CckFormsMap.AbstractMap
     @internalMapAPI.setZoom zoom
   setMarkerToPoint: (latitudeAndLongitude) ->
 
-  setCenterByGeocode: (geocode) ->
+  setCenterByGeocode: (geocode, apikey) ->
 
     options = {
       url:      'https://geocode-maps.yandex.ru/1.x/'
       dataType: 'json'
-      data:     {format: 'json', geocode: geocode, results: 1}
+      data:     {format: 'json', geocode: geocode, results: 1, apikey: apikey}
     }
 
     xhr = $.ajax options
@@ -256,7 +256,7 @@ window.init_map = (canvas) ->
   maps = {}
   $.each $source.data("allowedMaps"), (i, mapType) ->
     $map = $('#' + mapId + '_' + mapType)
-    maps[mapType] = new CckFormsMap.map(mapType, $map, initialPoint, fields, readOnly: readOnly)
+    maps[mapType] = CckFormsMap.map(mapType, $map, initialPoint, fields, readOnly: readOnly)
 
   $canvas.data('maps', maps)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.5.2
 platform: ruby
 authors:
 - Ilya Konanykhin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,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/index.webpack.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
@@ -101,7 +102,7 @@ homepage: http://github.com/ilya-konanykhin/cck_forms
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,9 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Content Construction Kit Forms
 test_files: []