effective_bootstrap 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9a288ad87b19d24f4b6e1975e47c1d3df2cb808
-  data.tar.gz: b799987fbaecf619052a29fbf6af042e3df6c196
+  metadata.gz: 7d7f86a0d2683a7ba00bec65b642d7d68a5381a4
+  data.tar.gz: f0ce7680a8e5ff6df8a9e31bda7d3bb10fc789e0
 SHA512:
-  metadata.gz: 76fc29549c4bc7cb4f5a6ae2b3f98eb159d8433f7ca504faea8d702f7204de98e180eb60aa36883db0cf43a3c66d5d7aeb3057723111c1567bb5cf1960fb3a8d
-  data.tar.gz: 273ec9ef33c9e1cbade35f16fd150ba19fbe8897046f5af4e2312bb7b1910fcc87c72a9495a87b4c6b3ea1a853c68bf11b207155150167dcd507aa66ede1b38a
+  metadata.gz: 4b9cafa5062102c1b1eb947c569a94f7c53826892e778c359fefe56b730a84dbd9565f165a924912157b2408e8d58e4a8bd25604d680c087b6b738deea34c747
+  data.tar.gz: e934a6fac03621ee5789aa05ea607c225a1ebf5040fa68ae16b4d6deb24a462a1202f7a514cd71bfe7651638f615e14e8a5f27faf29d561abd632c9ca58e780f

data/app/assets/javascripts/effective_datetime/overrides.js.coffee

@@ -40,3 +40,6 @@ $(document).on 'dp.end_date_initialized', (event) ->
   try
     date = $start_date.data('DateTimePicker').date()
     $end_date.data('DateTimePicker').minDate(date) if date
+
+$(document).on 'click', '.effective_date_time_picker_input_group', (event) ->
+  $(event.currentTarget).children('input').data('DateTimePicker').show()

data/app/assets/stylesheets/effective_datetime/overrides.scss

@@ -26,3 +26,6 @@
   background-color: inherit;
 }
 
+.effective_date_time_picker_input_group {
+  cursor: pointer;
+}

data/app/models/effective/form_input.rb

@@ -302,7 +302,7 @@ module Effective
         options[:input][:required] = 'required'
       end
 
-      if options[:input][:readonly] || form_readonly?
+      if readonly?
         options[:input][:readonly] = 'readonly'
 
         unless options[:input][:class].to_s.include?('form-control-plaintext')
@@ -310,7 +310,7 @@ module Effective
         end
       end
 
-      if disabled? || form_disabled?
+      if disabled?
         options[:input][:disabled] = 'disabled'
       end
 
@@ -359,8 +359,12 @@ module Effective
       @builder.readonly
     end
 
+    def readonly?
+      options.dig(:input, :readonly).present? || form_readonly?
+    end
+
     def disabled?
-      options.dig(:input, :disabled).present?
+      options.dig(:input, :disabled).present? || form_disabled?
     end
 
     def form_disabled?

data/app/models/effective/form_inputs/checks.rb

@@ -1,9 +1,16 @@
 module Effective
+
   module FormInputs
     class Checks < CollectionInput
 
       def build_input(&block)
-        @builder.collection_check_boxes(name, options_collection, value_method, label_method, collection_options, item_input_options) { |builder| build_item(builder) }
+        html = @builder.collection_check_boxes(name, options_collection, value_method, label_method, collection_options, item_input_options) { |builder| build_item(builder) }
+
+        if disabled? # collection_check_boxes doesn't correctly disable the input type hidden, but does on the build_items
+          html = html.sub('<input type="hidden"', '<input type="hidden" disabled="disabled"').html_safe
+        end
+
+        html
       end
 
       def build_wrapper(&block)

data/app/models/effective/form_inputs/date_field.rb

@@ -14,7 +14,7 @@ module Effective
       end
 
       def input_group_options
-        { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('calendar'), class: 'input-group-text') }
+        { input_group: { class: 'input-group effective_date_time_picker_input_group' }, prepend: content_tag(:span, icon('calendar'), class: 'input-group-text') }
       end
 
       def datetime_to_s

data/app/models/effective/form_inputs/datetime_field.rb

@@ -14,7 +14,7 @@ module Effective
       end
 
       def input_group_options
-        { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('calendar'), class: 'input-group-text') }
+        { input_group: { class: 'input-group effective_date_time_picker_input_group' }, prepend: content_tag(:span, icon('calendar'), class: 'input-group-text') }
       end
 
       def build_input(&block)

data/app/models/effective/form_inputs/radios.rb

@@ -20,7 +20,13 @@ module Effective
 
       def build_input(&block)
         build_button_group do
-          @builder.collection_radio_buttons(name, options_collection, value_method, label_method, collection_options, item_input_options) { |builder| build_item(builder) }
+          html = @builder.collection_radio_buttons(name, options_collection, value_method, label_method, collection_options, item_input_options) { |builder| build_item(builder) }
+
+          if disabled? # collection_check_boxes doesn't correctly disable the input type hidden, but does on the build_items
+            html = html.sub('<input type="hidden"', '<input type="hidden" disabled="disabled"').html_safe
+          end
+
+          html
         end
       end
 

data/app/models/effective/form_inputs/time_field.rb

@@ -14,7 +14,7 @@ module Effective
       end
 
       def input_group_options
-        { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('clock'), class: 'input-group-text') }
+        { input_group: { class: 'input-group effective_date_time_picker_input_group' }, prepend: content_tag(:span, icon('clock'), class: 'input-group-text') }
       end
 
       def datetime_to_s

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Code and Effect