Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
shihgianlee committed Mar 15, 2010
2 parents cbb650e + d74738e commit 4855fa0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/calendar_date_select/form_helpers.rb
Expand Up @@ -165,7 +165,7 @@ def calendar_date_select_process_options(options)
if (default_time = javascript_options[:default_time])
if default_time.respond_to?(:strftime)
javascript_options[:default_time] = "new Date('#{default_time.strftime(CalendarDateSelect.date_format_string(true))}')"
elsif default_time.is_a?(String) && !default_time.empty?
else
javascript_options[:default_time] = "function() { return #{default_time} }"
end
end
Expand Down

0 comments on commit 4855fa0

Please sign in to comment.