jquery_datepick 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10aa0098feed8fc190c90ae0ace18f8968659a9d
-  data.tar.gz: 93578bdf4c6973c37e7ae217d6b602da45b6253c
+  metadata.gz: 564a6cbbfcc8604a0ea3d4012e8b0a660f9eaa42
+  data.tar.gz: e733230a81a58a17bff818b5f6516d50fcf1124d
 SHA512:
-  metadata.gz: a908107ddd17fe2c71708b5dd3c49867e500fed14f27333db9b0c180b90053eb7e26ed04092878d6807fddf1ac8023b533f7d7cfd18933ba46a3cfdddd0994d2
-  data.tar.gz: 7e5caccdb8797ec1dfb20cfa19f009d92b528ebeb920190d611905b838e83a9cc1f550507db907a31ee71590c3c0c9271d2b68f1ece6129b6267cbef039f2701
+  metadata.gz: 084f975167a51077edd80ad6cb4dae6a6e70d173fc8d12cbdfdca7aa2e6f0df0bdf9fbe94b3a3a15fa4d0f0f403df695e6be489ebd96ac3d2c758f983955bb93
+  data.tar.gz: fa6ede8accc59361a89c0600828c73ad50de043186137de055d4818b1931841def10cbd2e30ae91eea0f39d10e66cf58f41ff15c5f8fe8f648e06db49a05f097

data/lib/jquery_datepick/form_helper.rb

@@ -7,11 +7,17 @@ module JqueryDatepick
 
     # Mehtod that generates datepicker input field inside a form
     def datepicker(object_name, method, options = {})
-      input_tag =  JqueryDatepick::InstanceTag.new(object_name, method, self, options.delete(:object))
+      options.delete(:object) if options[:object]
+      input_tag =  JqueryDatepick::InstanceTag.new(object_name, method, self, options)
       dp_options, tf_options =  input_tag.split_options(options)
       tf_options[:value] = input_tag.format_date(tf_options[:value], String.new(dp_options[:dateFormat])) if  tf_options[:value] && !tf_options[:value].empty? && dp_options.has_key?(:dateFormat)
-      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"]}').datepick(#{dp_options.to_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"]}').datepick($.extend(#{dp_options.to_json},$.datepick.regional['#{I18n.locale}']))});")
       html.html_safe
     end
     
@@ -25,7 +31,7 @@ module JqueryDatepick::FormBuilder
   end
 end
 
-class JqueryDatepick::InstanceTag < ActionView::Helpers::InstanceTag
+module JqueryDatepick_instance
 
   FORMAT_REPLACEMENTES = { "yy" => "%Y", "mm" => "%m", "dd" => "%d", "d" => "%-d", "m" => "%-m", "y" => "%y", "M" => "%b"}
   
@@ -58,4 +64,15 @@ class JqueryDatepick::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 JqueryDatepick::InstanceTag < ActionView::Helpers::InstanceTag
+    include JqueryDatepick_instance
+  end
+else
+  class JqueryDatepick::InstanceTag < ActionView::Helpers::Tags::Base
+    include JqueryDatepick_instance
+  end
+end

data/lib/jquery_datepick/version.rb

@@ -1,3 +1,3 @@
 module JqueryDatepick
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery_datepick
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Herman verschooten