effective_form_inputs 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d3e07769895f8fe1d25f353f7cca1b796aa8c4
-  data.tar.gz: af46d954e2c058fab64aa2188efa4b8808cf6ede
+  metadata.gz: 82987aa71a7ea0640039fdac3962555a982810d6
+  data.tar.gz: d3784ba5af000a1e585e013ff83720d0d6e672e0
 SHA512:
-  metadata.gz: 12d3ccf450c2e837c8f75af3056ffbae1eb1ca4edd8966a6747b65099d18419978aa649a5cd9d6c24842ff0bbb1c55acc5c0b128850974db27278a8827bfade0
-  data.tar.gz: b4ea5cef5220ecc5fd2f7d34a0f52dfe3191c2f1b436229a02db49d43cf46eee7fc813ea25507de3b2f5469568f3c73b8fcc9dd24cb05e39203799770995f935
+  metadata.gz: f9f416cf372c13830b9f1d4d1ca8b417de19bcc801432f2a66f9e80469c6ff4b061817344ff0a0a2fc6ef8a9ff183394a385cd7c54d142ac661b01f380f0c4f2
+  data.tar.gz: d1dd15c4e4d29e5f4a3b3b9bb82a52b7da4d3ef62c1de666938a6d7de6de3bf7dd8bcaf4cbd3facff74282060a51957d56050c311c11a1c7fcad791519736979

data/app/assets/javascripts/effective_date_picker/initialize.js.coffee

@@ -6,6 +6,7 @@ initialize = ->
     options = element.data('input-js-options') || {}
 
     element.addClass('initialized').datetimepicker(options)
+    element.trigger('dp.end_date_initialized') if (element.attr('name') || '').indexOf('[end_') != -1
 
 $ -> initialize()
 $(document).on 'page:change', -> initialize()

data/app/assets/javascripts/effective_date_time_picker/initialize.js.coffee

@@ -6,6 +6,7 @@ initialize = ->
     options = element.data('input-js-options') || {}
 
     element.addClass('initialized').datetimepicker(options)
+    element.trigger('dp.end_date_initialized') if (element.attr('name') || '').indexOf('[end_') != -1
 
 $ -> initialize()
 $(document).on 'page:change', -> initialize()

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

@@ -2,12 +2,32 @@ $(document).on 'dp.hide', (event) -> $(event.target).trigger('keyup')
 
 # When an input with field named "start_*" is changed, set it's corresponding "end_*" minDate
 $(document).on 'dp.change', (event) ->
-  $obj = $(event.target)
+  $start_date = $(event.target)
 
-  return if $obj.hasClass('not-date-linked')
-  return if $obj.attr('name').indexOf('[start_') == -1
+  return if $start_date.hasClass('not-date-linked')
+  return if ($start_date.attr('name') || '').indexOf('[start_') == -1
 
-  end_date = $obj.attr('name').replace('[start_', '[end_')
-  $end_date = $obj.closest('form').find("input[name='#{end_date}'].initialized:not(.not-date-linked)")
+  end_date = $start_date.attr('name').replace('[start_', '[end_')
+  $end_date = $start_date.closest('form').find("input[name='#{end_date}'].initialized")
+
+  return if $end_date.length == 0
+  return if $end_date.hasClass('not-date-linked')
 
   try $end_date.data('DateTimePicker').minDate(event.date)
+
+# When an input with field named "end_*" is initialized, set it's corresponding "start_*" minDate
+$(document).on 'dp.end_date_initialized', (event) ->
+  $end_date = $(event.target)
+
+  return if $end_date.hasClass('not-date-linked')
+  return if ($end_date.attr('name') || '').indexOf('[end_') == -1
+
+  start_date = $end_date.attr('name').replace('[end_', '[start_')
+  $start_date = $end_date.closest('form').find("input[name='#{start_date}'].initialized")
+
+  return if $start_date.length == 0
+  return if $start_date.hasClass('not-date-linked')
+
+  try
+    date = $start_date.data('DateTimePicker').date()
+    $end_date.data('DateTimePicker').minDate(date) if date

data/app/assets/javascripts/effective_time_picker/initialize.js.coffee

@@ -6,6 +6,7 @@ initialize = ->
     options = element.data('input-js-options') || {}
 
     element.addClass('initialized').datetimepicker(options)
+    element.trigger('dp.end_date_initialized') if (element.attr('name') || '').indexOf('[end_') != -1
 
 $ -> initialize()
 $(document).on 'page:change', -> initialize()

data/app/models/inputs/effective_select/input.rb

@@ -151,7 +151,7 @@ module Inputs
       def js_options
         @effective_select_js_options ||= super().tap do |js_options|
           js_options[:allowClear] = (options[:multiple] != true)
-          js_options[:tags] = (options[:tags] == true)
+          js_options[:tags] = (options[:tags] == true) unless js_options.key?(:tags)
           js_options[:tokenSeparators] = nil if options[:tags] != true
           js_options[:template] = options[:template] if options[:template].present?
 

data/app/models/inputs/effective_time_picker/input.rb

@@ -35,6 +35,10 @@ module Inputs
             html_options[:pattern] = '\d{2}:\d{2}' # Match default pattern defined above
           end
 
+          if options[:date_linked] == false
+            html_options[:class] << 'not-date-linked'
+          end
+
         end
       end
     end

data/lib/effective_form_inputs/version.rb

@@ -1,3 +1,3 @@
 module EffectiveFormInputs
-  VERSION = '1.1.11'.freeze
+  VERSION = '1.1.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_form_inputs
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails