From 01767ed1eff6974340bb43f0b5185ab7dfc872c0 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 25 Jan 2013 01:01:03 +0400 Subject: [PATCH 1/2] Try to fix error, when jQuery included at Try to fix with defer javascript loading. --- lib/app/helpers/form_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/app/helpers/form_helper.rb b/lib/app/helpers/form_helper.rb index fd5d15f..9a6c938 100644 --- a/lib/app/helpers/form_helper.rb +++ b/lib/app/helpers/form_helper.rb @@ -12,7 +12,7 @@ def datepicker(object_name, method, options = {}, timepicker = false) 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) method = timepicker ? "datetimepicker" : "datepicker" - html += javascript_tag("jQuery(document).ready(function(){jQuery('##{input_tag.get_name_and_id["id"]}').#{method}(#{dp_options.to_json})});") + html += javascript_tag("jQuery(document).ready(function(){jQuery('##{input_tag.get_name_and_id["id"]}').#{method}(#{dp_options.to_json})});", :defer => 'defer') html.html_safe end @@ -64,4 +64,4 @@ def translate_format(format) format.gsub!(/#{FORMAT_REPLACEMENTES.keys.join("|")}/) { |match| FORMAT_REPLACEMENTES[match] } end -end \ No newline at end of file +end From 023fb3d2d24fe3e6738f25169ec4aba2a239d33b Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 25 Jan 2013 01:08:01 +0400 Subject: [PATCH 2/2] Try to fix error, when jQuery included at With using window.onload. --- lib/app/helpers/form_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/app/helpers/form_helper.rb b/lib/app/helpers/form_helper.rb index 9a6c938..8477b4b 100644 --- a/lib/app/helpers/form_helper.rb +++ b/lib/app/helpers/form_helper.rb @@ -12,7 +12,7 @@ def datepicker(object_name, method, options = {}, timepicker = false) 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) method = timepicker ? "datetimepicker" : "datepicker" - html += javascript_tag("jQuery(document).ready(function(){jQuery('##{input_tag.get_name_and_id["id"]}').#{method}(#{dp_options.to_json})});", :defer => 'defer') + html += javascript_tag("window.onload = function() { jQuery(document).ready(function(){jQuery('##{input_tag.get_name_and_id["id"]}').#{method}(#{dp_options.to_json})}); }") html.html_safe end