calendar_date_select 1.16.3 → 1.16.4

data/History.txt

@@ -1,6 +1,11 @@
+== Version 1.16.4
+* do not add to public if they are in app/assets. (Michael Grosser)
+* action view helpers needs to be loaded first in order to as gem. (Sandip Ransing)
+* Fixed bug with 2-digit hours. "10:00 AM" was being parsed as "1:00 AM". (Nathan B)
+
 == Version 1.16.3
-* hungarian translation added (raszi)
-* Workaround IE bug (mvastola) 
+* hungarian translation added. (raszi)
+* Workaround IE bug. (mvastola) 
 
 == Version 1.16.2
 

data/VERSION

@@ -1 +1 @@
-1.16.3
+1.16.4

data/calendar_date_select.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{calendar_date_select}
-  s.version = "1.16.3"
+  s.version = "1.16.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shih-gian Lee", "Enrique Garcia Cota (kikito)", "Tim Charper", "Lars E. Hoeg"]

data/lib/calendar_date_select.rb

@@ -1,12 +1,13 @@
 require "calendar_date_select/calendar_date_select.rb"
 require "calendar_date_select/form_helpers.rb"
 require "calendar_date_select/includes_helper.rb"
+require "action_view/helpers"
 
-if Object.const_defined?(:Rails) && File.directory?(Rails.root.to_s + "/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)
-  
+
   # Filthy backwards compatibility hooks... grumble
   if ([Rails::VERSION::MAJOR, Rails::VERSION::MINOR] <=> [2, 2]) == -1
     ActionView::Helpers::InstanceTag.class_eval do
@@ -14,7 +15,7 @@ if Object.const_defined?(:Rails) && File.directory?(Rails.root.to_s + "/public")
         new(object_name, method_name, template_object, nil, object)
       end
     end
-    
+
   else
     ActionView::Helpers::InstanceTag.class_eval do
       class << self; alias new_with_backwards_compatibility new; end
@@ -22,7 +23,7 @@ if Object.const_defined?(:Rails) && File.directory?(Rails.root.to_s + "/public")
   end
 
   # install files
-  unless File.exists?(RAILS_ROOT + '/public/javascripts/calendar_date_select/calendar_date_select.js')
+  if !File.exists?(RAILS_ROOT + '/public/javascripts/calendar_date_select/calendar_date_select.js') and !File.exists?(RAILS_ROOT + '/app/assets/javascripts/calendar_date_select/calendar_date_select.js')
     ['/public', '/public/javascripts/calendar_date_select', '/public/stylesheets/calendar_date_select', '/public/images/calendar_date_select', '/public/javascripts/calendar_date_select/locale'].each do |dir|
       source = File.dirname(__FILE__) + "/../#{dir}"
       dest = RAILS_ROOT + dir
@@ -30,4 +31,4 @@ if Object.const_defined?(:Rails) && File.directory?(Rails.root.to_s + "/public")
       FileUtils.cp(Dir.glob(source+'/*.*'), dest)
     end
   end
-end
+end

data/public/javascripts/calendar_date_select/calendar_date_select.js

@@ -1,4 +1,4 @@
-// CalendarDateSelect version 1.16.3 - a prototype based date picker
+// CalendarDateSelect version 1.16.4 - 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_american.js

@@ -15,20 +15,20 @@ Date.parseFormattedString = function (string) {
   // 11/1/1111 01pm
   // 1/1/1111 01:11pm
   // 1/1/1111 1:11pm
-  var regexp = "(([0-1]?[0-9])\/[0-3]?[0-9]\/[0-9]{4}) *([0-9]{1,2}(:[0-9]{2})? *(am|pm))?";
+  var regexp = "(([0-1]?[0-9])\/[0-3]?[0-9]\/[0-9]{4}) *(([0-9]{1,2})(:[0-9]{2})? *(am|pm))?";
   string = string.strip();
   var d = string.match(new RegExp(regexp, "i"));
   if (d==null) {
     return Date.parse(string); // Give javascript a chance to parse it.
   }
-
+  
   mdy = d[1].split('/');
   hrs = 0;
   mts = 0;
   if(d[3] != null && d[3].strip() != "") {
-    hrs = parseInt(d[3].split('')[0], 10);
-    if(d[5].toLowerCase() == 'pm') { hrs += 12; } // Add 12 more to hrs
-    mts = d[4].split(':')[1];
+    hrs = parseInt(d[3], 10);
+    if(d[6].toLowerCase() == 'pm') { hrs += 12; } // Add 12 more to hrs
+    mts = d[5].split(':')[1];
   }
   
   return new Date(mdy[2], parseInt(mdy[0], 10)-1, mdy[1], hrs, mts, 0);

metadata

@@ -2,7 +2,7 @@
 name: calendar_date_select
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.16.3
+  version: 1.16.4
 platform: ruby
 authors: 
   - Shih-gian Lee
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -04:00
+date: 2010-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Calendar date picker for rails