calendar_date_select 1.13 → 1.14

data/History.txt

@@ -1,4 +1,7 @@
- == Version 1.13
+== Version 1.14
+ * Added support for Rails 2.3
+
+== Version 1.13
  * Lots of code clean up!
  * Moved test suite over to rspec
  * CalendarDateSelect.default_options implemented.  Use CalendarDateSelect.default_options.update(...) to set the default_options for your app.

data/lib/calendar_date_select.rb

@@ -2,7 +2,7 @@ require "calendar_date_select/calendar_date_select.rb"
 require "calendar_date_select/form_helpers.rb"
 require "calendar_date_select/includes_helper.rb"
 
-if Object.const_defined?(:Rails) && File.directory?(Rails.root + "/public")
+if Object.const_defined?(:Rails) && File.directory?(Rails.root.to_s + "/public")  
   ActionView::Helpers::FormHelper.send(:include, CalendarDateSelect::FormHelpers)
   ActionView::Base.send(:include, CalendarDateSelect::FormHelpers)
   ActionView::Base.send(:include, CalendarDateSelect::IncludesHelper)

data/lib/calendar_date_select/calendar_date_select.rb

@@ -1,5 +1,5 @@
 module CalendarDateSelect
-  VERSION = '1.13'
+  VERSION = '1.14'
   FORMATS = {
     :natural => {
       :date => "%B %d, %Y",

data/lib/calendar_date_select/form_helpers.rb

@@ -198,7 +198,8 @@ module CalendarDateSelect::FormHelpers
         out << " "
         out << image_tag(options[:image],
             :onclick => "new CalendarDateSelect( $(this).previous(), #{options_for_javascript(javascript_options)} );",
-            :style => 'border:0px; cursor:pointer;')
+            :style => 'border:0px; cursor:pointer;',
+			:class=>'calendar_date_select_popup_icon')
       end
       out
     end

data/lib/calendar_date_select/includes_helper.rb

@@ -7,7 +7,7 @@ module CalendarDateSelect::IncludesHelper
 
   # returns an array of javascripts needed for the selected locale, date_format, and calendar control itself.
   def calendar_date_select_javascripts(options = {})
-    options.assert_valid_keys(:format, :locale)
+    options.assert_valid_keys(:locale)
     files = ["calendar_date_select/calendar_date_select"]
     files << "calendar_date_select/locale/#{options[:locale]}" if options[:locale]
     files << "calendar_date_select/#{CalendarDateSelect.format[:javascript_include]}" if CalendarDateSelect.format[:javascript_include]
@@ -20,10 +20,10 @@ module CalendarDateSelect::IncludesHelper
     @cds_already_included=true
     
     options = (Hash === args.last) ? args.pop : {}
-    options.assert_valid_keys(:style, :format, :locale)
+    options.assert_valid_keys(:style, :locale)
     options[:style] ||= args.shift
     
-    javascript_include_tag(*calendar_date_select_javascripts(:locale => options[:locale], :format => options[:format])) + "\n" +
+    javascript_include_tag(*calendar_date_select_javascripts(:locale => options[:locale])) + "\n" +
     stylesheet_link_tag(*calendar_date_select_stylesheets(:style => options[:style])) + "\n"
   end
 end

data/public/javascripts/calendar_date_select/calendar_date_select.js

@@ -1,4 +1,4 @@
-// CalendarDateSelect version 1.13 - a prototype based date picker
+// CalendarDateSelect version 1.14 - a prototype based date picker
 // Questions, comments, bugs? - see the project page: http://code.google.com/p/calendardateselect
 if (typeof Prototype == 'undefined') alert("CalendarDateSelect Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (.g. <%= javascript_include_tag :defaults %>) *before* it includes calendar_date_select.js (.g. <%= calendar_date_select_includes %>).");
 if (Prototype.Version < "1.6") alert("Prototype 1.6.0 is required.  If using earlier version of prototype, please use calendar_date_select version 1.8.3");

data/public/javascripts/calendar_date_select/format_hyphen_ampm.js

@@ -18,11 +18,12 @@ Date.parseFormattedString = function (string) {
   if (d[7]) {
     hours = parseInt(d[7], 10);
     offset=0;
-    is_pm = (d[9].toLowerCase()=="pm")
-    if (is_pm && hours <= 11) hours+=12;
-    if (!is_pm && hours == 12) hours=0;
+    if (d[9]) {
+        is_pm = (d[9].toLowerCase()=="pm");
+        if (is_pm && hours <= 11) hours+=12;
+        if (!is_pm && hours == 12) hours=0;
+    }
     date.setHours(hours); 
-    
   }
   if (d[8]) { date.setMinutes(d[8]); }
   if (d[10]) { date.setSeconds(d[10]); }

data/spec/calendar_date_select/form_helpers_spec.rb

@@ -124,6 +124,11 @@ describe CalendarDateSelect::FormHelpers do
     output.should_not include("image:")
   end
 
+  it "should use the CSS class calendar_date_select_tag for popup selector icon" do
+    output = calendar_date_select_tag(:name, "Some String", :image => "boogy.png")
+    output.should include("calendar_date_select_popup_icon")
+  end
+
   describe "calendar_date_select_tag" do
     it "should use the string verbatim when provided" do
       output = calendar_date_select_tag(:name, "Some String")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: calendar_date_select
 version: !ruby/object:Gem::Version 
-  version: "1.13"
+  version: "1.14"
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-30 00:00:00 -07:00
+date: 2009-02-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency