jquery_datetimepick 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc89df1e21908d1166b9abfb674a9a588445628
-  data.tar.gz: 7b2ad282561fc736e41da20638d5aff89674acd9
+  metadata.gz: 49693dc7849afe540aa873ce5c1c9543e72d50d6
+  data.tar.gz: 30ee4f95788beb90a6ce84b06d67b4e765a3680a
 SHA512:
-  metadata.gz: a4d897e6b0c2f3790be0dd6850057d3544136dde7d567dd20e7bd3b138249420b74f28183f1ccb3dcf9757cceeaf20b0a74ab125be8bc9f6cf0eb9c7924f1a31
-  data.tar.gz: 8a025eea31f6cb494eb8bb8e6c7e99bcce966bb6350a8ab33fb2b0cdae7575fb73443f85562717e599c3d3b317910bae94974eae7e4f1a356d9f79c2620dddc6
+  metadata.gz: 9c4dc1d5bb28f80d590a471ac974a005a1a3278d3ec68db84111dfbcd02859656a4a7272255300d14f6638722ca7a5e001c668df853c2b1a75bb12ecce3f0831
+  data.tar.gz: f92a586e8caddd8f4139588fc6b5bac5e899d1bb30aa8027f1779a2adf62530e7f6a8e37b4523ce5c401525fa26beea9513268c593348d5577d6e4d8a2273a68

data/lib/jquery_datetimepick/form_helper.rb

@@ -7,7 +7,7 @@ module JqueryDatetimepick
 
     # Mehtod that generates datetimepicker input field inside a form
     def datetimepicker(object_name, method, options = {})
-      input_tag =  JqueryDatetimepick::InstanceTag.new(object_name, method, self, options.delete(:object))
+      input_tag =  JqueryDatetimepick::InstanceTag.new(object_name, method, self, options)
       dp_options, tf_options =  input_tag.split_options(options)
       tf_options[:value] = input_tag.format_datetime(tf_options[:value], String.new(dp_options[:dateFormat])) if  tf_options[:value] && !tf_options[:value].empty? && dp_options.has_key?(:dateFormat)
       [ :minDateTime, :maxDateTime ].each do |var|
@@ -22,8 +22,12 @@ module JqueryDatetimepick
       json = dp_options.to_json
       json.gsub! /"(new Date\([^\)]*\))"/, '\1'
       json.gsub! /"(function\(\) \{[^\}]*\})"/, '\1'
-      html = input_tag.to_input_field_tag("text", tf_options)
-      html += javascript_tag("jQuery(document).ready(function(){jQuery('##{input_tag.get_name_and_id["id"]}').datetimepicker(#{json})});")
+      html= if defined?(ActionView::Helpers::InstanceTag) && ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
+        input_tag.to_input_field_tag("text", tf_options)
+      else
+        ActionView::Helpers::Tags::TextField.new(object_name, method, tf_options).render
+      end
+      html += javascript_tag("jQuery(document).ready(function(){jQuery('##{input_tag.get_name_and_id["id"]}').datetimepicker($.extend(#{json}, $.timepicker.regional[#{I18n.locale}]))});")
       html.html_safe
     end
     
@@ -37,8 +41,7 @@ module JqueryDatetimepick::FormBuilder
   end
 end
 
-class JqueryDatetimepick::InstanceTag < ActionView::Helpers::InstanceTag
-
+module JqueryDatetimepick_instance
   FORMAT_REPLACEMENTES = { "yy" => "%Y", "mm" => "%m", "dd" => "%d", "d" => "%-d", "m" => "%-m", "y" => "%y", "M" => "%b", "hh" => "%H", "h" => "%I", "mm" => "%M"}
   
   # Extending ActionView::Helpers::InstanceTag module to make Rails build the name and id
@@ -90,4 +93,15 @@ class JqueryDatetimepick::InstanceTag < ActionView::Helpers::InstanceTag
   def translate_format(format)
     format.gsub!(/#{FORMAT_REPLACEMENTES.keys.join("|")}/) { |match| FORMAT_REPLACEMENTES[match] }
   end
-end
+end
+
+if defined?(ActionView::Helpers::InstanceTag) && ActionView::Helpers::InstanceTag.instance_method(:initialize).arity != 0
+class JqueryDatetimepick::InstanceTag < ActionView::Helpers::InstanceTag
+    include JqueryDatetimepick_instance
+  end
+else
+  class JqueryDatetimepick::InstanceTag < ActionView::Helpers::Tags::Base
+    include JqueryDatetimepick_instance
+  end
+end
+

data/lib/jquery_datetimepick/version.rb

@@ -1,3 +1,3 @@
 module JqueryDatetimepick
-    VERSION = "1.3.3"
+    VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery_datetimepick
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Herman verschooten