@@ -1,3 +1,5 @@ + * Bugfix: don't include the :image option in the input field + == Version 1.14 * Added support for Rails 2.3 History.txt @@ -96,7 +96,7 @@ module CalendarDateSelect::FormHelpers # # <%= calendar_date_select_tag "event_demo", "", :after_navigate => "alert('The current selected month is ' + this.calendar_date_select.selected_date.getMonth());" , def calendar_date_select_tag( name, value = nil, options = {}) - options, javascript_options = calendar_date_select_process_options(options) + image, options, javascript_options = calendar_date_select_process_options(options) value = CalendarDateSelect.format_time(value, javascript_options) javascript_options.delete(:format) @@ -106,7 +106,7 @@ module CalendarDateSelect::FormHelpers hidden_field_tag(name, value, options) : text_field_tag(name, value, options) - calendar_date_select_output(tag, options, javascript_options) + calendar_date_select_output(tag, image, options, javascript_options) end # Similar to the difference between +text_field_tag+ and +text_field+, this method behaves like +text_field+ @@ -126,7 +126,7 @@ module CalendarDateSelect::FormHelpers use_time = false if Date===(obj.respond_to?(method) && obj.send(method)) end - options, javascript_options = calendar_date_select_process_options(options) + image, options, javascript_options = calendar_date_select_process_options(options) options[:value] ||= if(obj.respond_to?(method) && obj.send(method).respond_to?(:strftime)) @@ -142,6 +142,7 @@ module CalendarDateSelect::FormHelpers tag = ActionView::Helpers::InstanceTag.new_with_backwards_compatibility(object, method, self, options.delete(:object)) calendar_date_select_output( tag.to_input_field_tag( (javascript_options[:hidden] || javascript_options[:embedded]) ? "hidden" : "text", options), + image, options, javascript_options ) @@ -151,6 +152,7 @@ module CalendarDateSelect::FormHelpers # extracts any options passed into calendar date select, appropriating them to either the Javascript call or the html tag. def calendar_date_select_process_options(options) options, javascript_options = CalendarDateSelect.default_options.merge(options), {} + image = options.delete(:image) callbacks = [:before_show, :before_close, :after_show, :after_close, :after_navigate] for key in [:time, :valid_date_check, :embedded, :buttons, :clear_button, :format, :year_range, :month_year, :popup, :hidden, :minute_interval] + callbacks javascript_options[key] = options.delete(key) if options.has_key?(key) @@ -184,10 +186,10 @@ module CalendarDateSelect::FormHelpers end javascript_options[:year_range] = format_year_range(javascript_options[:year_range] || 10) - [options, javascript_options] + [image, options, javascript_options] end - def calendar_date_select_output(input, options = {}, javascript_options = {}) + def calendar_date_select_output(input, image, options = {}, javascript_options = {}) out = input if javascript_options[:embedded] uniq_id = "cds_placeholder_#{(rand*100000).to_i}" @@ -196,7 +198,7 @@ module CalendarDateSelect::FormHelpers out << javascript_tag("new CalendarDateSelect( $('#{uniq_id}').previous(), #{options_for_javascript(javascript_options)} ); ") else out << " " - out << image_tag(options[:image], + out << image_tag(image, :onclick => "new CalendarDateSelect( $(this).previous(), #{options_for_javascript(javascript_options)} );", :style => 'border:0px; cursor:pointer;', :class=>'calendar_date_select_popup_icon') lib/calendar_date_select/form_helpers.rb @@ -130,6 +130,10 @@ describe CalendarDateSelect::FormHelpers do end describe "calendar_date_select_tag" do + before(:each) do + @time = Time.parse("January 2, 2007 12:01:23 AM") + end + it "should use the string verbatim when provided" do output = calendar_date_select_tag(:name, "Some String") @@ -137,25 +141,26 @@ describe CalendarDateSelect::FormHelpers do end it "should not render the time when time is false (or nil)" do - time = Time.parse("January 2, 2007 12:01:23 AM") - output = calendar_date_select_tag(:name, time, :time => false) + output = calendar_date_select_tag(:name, @time, :time => false) output.should_not match(/12:01 AM/) - output.should include(CalendarDateSelect.format_date(time.to_date)) + output.should include(CalendarDateSelect.format_date(@time.to_date)) end it "should render the time when :time => true" do - time = Time.parse("January 2, 2007 12:01:23 AM") - output = calendar_date_select_tag(:name, time, :time => true) + output = calendar_date_select_tag(:name, @time, :time => true) - output.should include(CalendarDateSelect.format_date(time)) + output.should include(CalendarDateSelect.format_date(@time)) end it "should render the time when :time => 'mixed'" do - time = Time.parse("January 2, 2007 12:01:23 AM") - output = calendar_date_select_tag(:name, time, :time => 'mixed') - - output.should include(CalendarDateSelect.format_date(time)) + output = calendar_date_select_tag(:name, @time, :time => 'mixed') + output.should include(CalendarDateSelect.format_date(@time)) + end + + it "not include the image option in the result input tag" do + output = calendar_date_select_tag(:name, @time, :time => 'mixed') + output.should_not include("image=") end end end spec/calendar_date_select/form_helpers_spec.rb 137b830112e337b92b7ee4f304a0d95f6cd6d09c Tim Harper timcharper@gmail.com http://github.com/timcharper/calendar_date_select/commit/ad7d3cea6a7966b4590ed5f1abd99138ba1934e5 ad7d3cea6a7966b4590ed5f1abd99138ba1934e5 2009-02-19T21:42:11-08:00 2009-02-19T21:41:41-08:00 don't include the :image option in the input field 7f6ef206c62b5bd18a86fd056e122fe64d78d833 Tim Harper timcharper@gmail.com