History.txt
Manifest.txt
Rakefile
Readme.txt
lib/calendar_date_select/calendar_date_select.rb
lib/calendar_date_select/form_helpers.rb
lib/calendar_date_select/includes_helper.rb
public/javascripts/calendar_date_select/locale/de.js
public/javascripts/calendar_date_select/locale/ru.js
spec/calendar_date_select/calendar_date_select_spec.rb
spec/calendar_date_select/form_helpers_spec.rb
spec/calendar_date_select/includes_helper_spec.rb
spec/spec_helper.rb
@@ -1,14 +1,33 @@
Gem::Specification.new do |s|
- s.name = "calendar_date_select"
- s.version = "1.11"
- s.date = "2008-06-24"
- s.summary = "A popular and flexible JavaScript DatePicker for RubyOnRails"
- s.email = "timcharper@gmail.com"
- s.homepage = "http://github.com/timcharper/calendar_date_select"
- s.description = "CalendarDateSelect is semi-light-weight and easy to use! It takes full advantage of the prototype.js library, resulting in less code, but maintaining a great deal of functionality. Project site: http://code.google.com/p/calendardateselect/"
- s.has_rdoc = false
+ s.name = %q{calendar_date_select}
+ s.version = "1.11.1"
+
+ s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Tim Harper"]
- s.files = ["CHANGELOG","MIT-LICENSE","README","calendar_date_select.gemspec","init.rb","js_test/prototype.js","js_test/test.css","js_test/unittest.js","js_test/functional/cds_test.html","js_test/unit/cds_helper_methods.html","lib/calendar_date_select.rb","lib/gem_init.rb","lib/includes_helper.rb","public/blank_iframe.html","public/images/calendar_date_select/calendar.gif","public/javascripts/calendar_date_select/calendar_date_select.js","public/javascripts/calendar_date_select/format_american.js","public/javascripts/calendar_date_select/format_db.js","public/javascripts/calendar_date_select/format_euro_24hr.js","public/javascripts/calendar_date_select/format_euro_24hr_ymd.js","public/javascripts/calendar_date_select/format_finnish.js","public/javascripts/calendar_date_select/format_hyphen_ampm.js","public/javascripts/calendar_date_select/format_iso_date.js","public/javascripts/calendar_date_select/format_italian.js","public/javascripts/calendar_date_select/locale/fi.js","public/javascripts/calendar_date_select/locale/pl.js","public/javascripts/calendar_date_select/locale/pt.js","public/stylesheets/calendar_date_select/blue.css","public/stylesheets/calendar_date_select/default.css","public/stylesheets/calendar_date_select/plain.css","public/stylesheets/calendar_date_select/red.css","public/stylesheets/calendar_date_select/silver.css","test/test_helper.rb","test/functional/calendar_date_select_test.rb","test/functional/helper_methods_test.rb"]
- s.test_files = ["test/test_helper.rb","test/functional/calendar_date_select_test.rb","test/functional/helper_methods_test.rb"]
-end
+ s.date = %q{2008-11-23}
+ s.description = %q{}
+ s.email = ["tim c harper at gmail dot com"]
+ s.extra_rdoc_files = ["History.txt", "Manifest.txt", "Readme.txt"]
+ s.files = ["History.txt", "init.rb", "js_test/functional/cds_test.html", "js_test/prototype.js", "js_test/test.css", "js_test/unit/cds_helper_methods.html", "js_test/unittest.js", "lib/calendar_date_select/calendar_date_select.rb", "lib/calendar_date_select/includes_helper.rb", "lib/calendar_date_select.rb", "Manifest.txt", "MIT-LICENSE", "public/blank_iframe.html", "public/images/calendar_date_select/calendar.gif", "public/javascripts/calendar_date_select/calendar_date_select.js", "public/javascripts/calendar_date_select/format_american.js", "public/javascripts/calendar_date_select/format_db.js", "public/javascripts/calendar_date_select/format_euro_24hr.js", "public/javascripts/calendar_date_select/format_euro_24hr_ymd.js", "public/javascripts/calendar_date_select/format_finnish.js", "public/javascripts/calendar_date_select/format_hyphen_ampm.js", "public/javascripts/calendar_date_select/format_iso_date.js", "public/javascripts/calendar_date_select/format_italian.js", "public/javascripts/calendar_date_select/locale/de.js", "public/javascripts/calendar_date_select/locale/fi.js", "public/javascripts/calendar_date_select/locale/fr.js", "public/javascripts/calendar_date_select/locale/pl.js", "public/javascripts/calendar_date_select/locale/pt.js", "public/javascripts/calendar_date_select/locale/ru.js", "public/stylesheets/calendar_date_select/blue.css", "public/stylesheets/calendar_date_select/default.css", "public/stylesheets/calendar_date_select/plain.css", "public/stylesheets/calendar_date_select/red.css", "public/stylesheets/calendar_date_select/silver.css", "Rakefile", "Readme.txt", "test/functional/calendar_date_select_test.rb", "test/functional/helper_methods_test.rb", "test/test_helper.rb"]
+ s.has_rdoc = true
+ s.homepage = %q{http://code.google.com/p/calendardateselect/}
+ s.rdoc_options = ["--main", "README.txt"]
+ s.require_paths = ["lib"]
+ s.rubyforge_project = %q{calendar_date_select}
+ s.rubygems_version = %q{1.3.0}
+ s.summary = %q{}
+ s.test_files = ["test/test_helper.rb"]
+ if s.respond_to? :specification_version then
+ current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+ s.specification_version = 2
+
+ if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+ s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+ else
+ s.add_dependency(%q<hoe>, [">= 1.8.0"])
+ end
+ else
+ s.add_dependency(%q<hoe>, [">= 1.8.0"])
+ end
+end
calendar_date_select.gemspec
@@ -1,17 +1 @@
-%w[calendar_date_select includes_helper].each { |file|
- require File.join( File.dirname(__FILE__), "lib",file)
-}
-
-ActionView::Helpers::FormHelper.send(:include, CalendarDateSelect::FormHelper)
-ActionView::Base.send(:include, CalendarDateSelect::FormHelper)
-ActionView::Base.send(:include, CalendarDateSelect::IncludesHelper)
-
-# install files
-unless File.exists?(RAILS_ROOT + '/public/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.join(directory,dir)
- dest = RAILS_ROOT + dir
- FileUtils.mkdir_p(dest)
- FileUtils.cp(Dir.glob(source+'/*.*'), dest)
- end
-end
+require File.dirname(__FILE__) + "/lib/calendar_date_select.rb"
init.rb
@@ -1,222 +1,33 @@
-class CalendarDateSelect
- FORMATS = {
- :natural => {
- :date => "%B %d, %Y",
- :time => " %I:%M %p"
- },
- :hyphen_ampm => {
- :date => "%Y-%m-%d",
- :time => " %I:%M %p",
- :javascript_include => "format_hyphen_ampm"
- },
- :iso_date => {
- :date => "%Y-%m-%d",
- :time => " %H:%M",
- :javascript_include => "format_iso_date"
- },
- :finnish => {
- :date => "%d.%m.%Y",
- :time => " %H:%M",
- :javascript_include => "format_finnish"
- },
- :american => {
- :date => "%m/%d/%Y",
- :time => " %I:%M %p",
- :javascript_include => "format_american"
- },
- :euro_24hr => {
- :date => "%d %B %Y",
- :time => " %H:%M",
- :javascript_include => "format_euro_24hr"
- },
- :euro_24hr_ymd => {
- :date => "%Y.%m.%d",
- :time => " %H:%M",
- :javascript_include => "format_euro_24hr_ymd"
- },
- :italian => {
- :date => "%d/%m/%Y",
- :time => " %H:%M",
- :javascript_include => "format_italian"
- },
- :db => {
- :date => "%Y-%m-%d",
- :time => "%H:%M",
- :javascript_include => "format_db"
- }
- }
-
- cattr_accessor :image
- @@image = "calendar_date_select/calendar.gif"
-
- cattr_reader :format
- @@format = FORMATS[:natural]
-
- class << self
- def format=(format)
- raise "CalendarDateSelect: Unrecognized format specification: #{format}" unless FORMATS.has_key?(format)
- @@format = FORMATS[format]
- end
-
- def javascript_format_include
- @@format[:javascript_include] && "calendar_date_select/#{@@format[:javascript_include]}"
- end
-
- def date_format_string(time=false)
- @@format[:date] + ( time ? @@format[:time] : "" )
- end
-
- def format_date(date)
- if Date===date
- date.strftime(date_format_string(false))
- else
- date.strftime(date_format_string(true))
- end
- end
-
- def has_time?(value)
- /[0-9]:[0-9]{2}/.match(value.to_s)
- end
- end
-
- module FormHelper
- def calendar_date_select_tag( name, value = nil, options = {})
- calendar_options = calendar_date_select_process_options(options)
- value = format_time(value, calendar_options)
-
- calendar_options.delete(:format)
-
- options[:id] ||= name
- tag = calendar_options[:hidden] || calendar_options[:embedded] ?
- hidden_field_tag(name, value, options) :
- text_field_tag(name, value, options)
-
- calendar_date_select_output(tag, calendar_options)
- end
-
- def format_time(value, options = {})
- if value.respond_to?("strftime")
- if options[:format]
- value = value.strftime(options[:format])
- else
- if options.has_key? :time
- value = value.strftime(CalendarDateSelect.date_format_string(options[:time]))
- else
- value = CalendarDateSelect.format_date(value)
- end
- end
- end
- value
- end
-
- # 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)
- calendar_options = {}
- callbacks = [:before_show, :before_close, :after_show, :after_close, :after_navigate]
- for key in [:time, :valid_date_check, :embedded, :buttons, :format, :year_range, :month_year, :popup, :hidden] + callbacks
- calendar_options[key] = options.delete(key) if options.has_key?(key)
- end
-
- # if passing in mixed, pad it with single quotes
- calendar_options[:time] = "'mixed'" if calendar_options[:time].to_s=="mixed"
- calendar_options[:month_year] = "'#{calendar_options[:month_year]}'" if calendar_options[:month_year]
-
- # if we are forcing the popup, automatically set the readonly property on the input control.
- if calendar_options[:popup].to_s == "force"
- calendar_options[:popup] = "'force'"
- options[:readonly] = true
- end
-
- if (vdc=calendar_options.delete(:valid_date_check))
- if vdc.include?(";") || vdc.include?("function")
- throw ":valid_date_check function is missing a 'return' statement. Try something like: :valid_date_check => 'if (date > new(Date)) return true; else return false;'" unless vdc.include?("return");
- end
-
- vdc = "return(#{vdc})" unless vdc.include?("return")
- vdc = "function(date) { #{vdc} }" unless vdc.include?("function")
- calendar_options[:valid_date_check] = vdc
- end
-
- calendar_options[:popup_by] ||= "this" if calendar_options[:hidden]
-
- # surround any callbacks with a function, if not already done so
- for key in callbacks
- calendar_options[key] = "function(param) { #{calendar_options[key]} }" unless calendar_options[key].include?("function") if calendar_options[key]
- end
-
- calendar_options[:year_range] = format_year_range(calendar_options[:year_range] || 10)
- calendar_options
- end
-
- def calendar_date_select(object, method, options={})
- obj = options[:object] || instance_variable_get("@#{object}")
-
- if !options.include?(:time) && obj.class.respond_to?("columns_hash")
- column_type = (obj.class.columns_hash[method.to_s].type rescue nil)
- options[:time] = true if column_type == :datetime
- end
-
- use_time = options[:time]
-
- if options[:time].to_s=="mixed"
- use_time = false if Date===(obj.respond_to?(method) && obj.send(method))
- end
-
- calendar_options = calendar_date_select_process_options(options)
-
- options[:value] ||=
- if(obj.respond_to?(method) && obj.send(method).respond_to?(:strftime))
- obj.send(method).strftime(CalendarDateSelect.date_format_string(use_time))
- elsif obj.respond_to?("#{method}_before_type_cast")
- obj.send("#{method}_before_type_cast")
- elsif obj.respond_to?(method)
- obj.send(method).to_s
- else
- nil
- end
-
- tag = ActionView::Helpers::InstanceTag.new(object, method, self, nil, options.delete(:object))
- calendar_date_select_output(
- tag.to_input_field_tag( (calendar_options[:hidden] || calendar_options[:embedded]) ? "hidden" : "text", options),
- calendar_options
- )
- end
-
- def calendar_date_select_output(input, calendar_options = {})
- out = input
- if calendar_options[:embedded]
- uniq_id = "cds_placeholder_#{(rand*100000).to_i}"
- # we need to be able to locate the target input element, so lets stick an invisible span tag here we can easily locate
- out << content_tag(:span, nil, :style => "display: none; position: absolute;", :id => uniq_id)
-
- out << javascript_tag("new CalendarDateSelect( $('#{uniq_id}').previous(), #{options_for_javascript(calendar_options)} ); ")
- else
- out << " "
-
- out << image_tag(CalendarDateSelect.image,
- :onclick => "new CalendarDateSelect( $(this).previous(), #{options_for_javascript(calendar_options)} );",
- :style => 'border:0px; cursor:pointer;')
- end
-
- out
- end
-
- private
- def format_year_range(year) # nodoc
- return year unless year.respond_to?(:first)
- return "[#{year.first}, #{year.last}]" unless year.first.respond_to?(:strftime)
- return "[#{year.first.year}, #{year.last.year}]"
- end
- end
-end
-
-
-module ActionView
- module Helpers
- class FormBuilder
- def calendar_date_select(method, options = {})
- @template.calendar_date_select(@object_name, method, options.merge(:object => @object))
- end
- end
- end
-end
+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")
+ 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
+ def self.new_with_backwards_compatibility(object_name, method_name, template_object, object = nil)
+ 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
+ end
+ end
+
+ # install files
+ unless File.exists?(RAILS_ROOT + '/public/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
+ FileUtils.mkdir_p(dest)
+ FileUtils.cp(Dir.glob(source+'/*.*'), dest)
+ end
+ end
+end
\ No newline at end of file
lib/calendar_date_select.rb
@@ -1,2 +1,2 @@
-<!-- Nothing here -->
-<html><head></head><body></body></html>
\ No newline at end of file
+<!-- Nothing here; part of the calendar_date_select plugin -->
+<html><head></head><body></body></html>
public/blank_iframe.html
@@ -1,23 +1,22 @@
-// CalendarDateSelect version 1.10.2 - a prototype based date picker
-// Questions, comments, bugs? - email the Author - Tim Harper <"timseeharper@gmail.seeom".gsub("see", "c")>
+// CalendarDateSelect version 1.13 - 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");
Element.addMethods({
purgeChildren: function(element) { $A(element.childNodes).each(function(e){$(e).remove();}); },
build: function(element, type, options, style) {
- var newElement = Element.build(type, options, style);
+ var newElement = Element.buildAndAppend(type, options, style);
element.appendChild(newElement);
return newElement;
}
});
-Element.build = function(type, options, style)
+Element.buildAndAppend = function(type, options, style)
{
var e = $(document.createElement(type));
- $H(options).each(function(pair) { eval("e." + pair.key + " = pair.value" ); });
- if (style)
- $H(style).each(function(pair) { eval("e.style." + pair.key + " = pair.value" ); });
+ $H(options).each(function(pair) { e[pair.key] = pair.value });
+ if (style) e.setStyle(style);
return e;
};
nil = null;
@@ -47,7 +46,8 @@ window.f_scrollTop = function() { return ([window.pageYOffset ? window.pageYOffs
_translations = {
"OK": "OK",
"Now": "Now",
- "Today": "Today"
+ "Today": "Today",
+ "Clear": "Clear"
}
SelectBox = Class.create();
SelectBox.prototype = {
@@ -82,6 +82,7 @@ CalendarDateSelect.prototype = {
popup: nil,
time: false,
buttons: true,
+ clear_button: true,
year_range: 10,
close_on_click: nil,
minute_interval: 5,
@@ -104,9 +105,9 @@ CalendarDateSelect.prototype = {
},
positionCalendarDiv: function() {
var above = false;
- var c_pos = this.calendar_div.viewportOffset(), c_left = c_pos[0], c_top = c_pos[1], c_dim = this.calendar_div.getDimensions(), c_height = c_dim.height, c_width = c_dim.width;
+ var c_pos = this.calendar_div.cumulativeOffset(), c_left = c_pos[0], c_top = c_pos[1], c_dim = this.calendar_div.getDimensions(), c_height = c_dim.height, c_width = c_dim.width;
var w_top = window.f_scrollTop(), w_height = window.f_height();
- var e_dim = $(this.options.get("popup_by")).viewportOffset(), e_top = e_dim[1], e_left = e_dim[0], e_height = $(this.options.get("popup_by")).getDimensions().height, e_bottom = e_top + e_height;
+ var e_dim = $(this.options.get("popup_by")).cumulativeOffset(), e_top = e_dim[1], e_left = e_dim[0], e_height = $(this.options.get("popup_by")).getDimensions().height, e_bottom = e_top + e_height;
if ( (( e_bottom + c_height ) > (w_top + w_height)) && ( e_bottom - c_height > w_top )) above = true;
var left_px = e_left.toString() + "px", top_px = (above ? (e_top - c_height ) : ( e_top + e_height )).toString() + "px";
@@ -223,7 +224,7 @@ CalendarDateSelect.prototype = {
onclick: function() {this.today(false); return false;}.bindAsEventListener(this)
});
- if (this.options.get("time")=="mixed") buttons_div.build("span", {innerHTML: " | ", className:"button_seperator"})
+ if (this.options.get("time")=="mixed") buttons_div.build("span", {innerHTML: " | ", className:"button_seperator"})
if (this.options.get("time")) b = buttons_div.build("a", {
innerHTML: _translations["Now"],
@@ -231,11 +232,15 @@ CalendarDateSelect.prototype = {
onclick: function() {this.today(true); return false}.bindAsEventListener(this)
});
- if (!this.options.get("embedded"))
+ if (!this.options.get("embedded") && !this.closeOnClick())
{
- buttons_div.build("span", {innerHTML: " "});
+ buttons_div.build("span", {innerHTML: " | ", className:"button_seperator"})
buttons_div.build("a", { innerHTML: _translations["OK"], href: "#", onclick: function() {this.close(); return false;}.bindAsEventListener(this) });
}
+ if (this.options.get('clear_button')) {
+ buttons_div.build("span", {innerHTML: " | ", className:"button_seperator"})
+ buttons_div.build("a", { innerHTML: _translations["Clear"], href: "#", onclick: function() {this.clearDate(); if (!this.options.get("embedded")) this.close(); return false;}.bindAsEventListener(this) });
+ }
}
},
refresh: function ()
@@ -337,6 +342,14 @@ CalendarDateSelect.prototype = {
this.date.setDate(1);
},
updateFooter:function(text) { if (!text) text = this.dateString(); this.footer_div.purgeChildren(); this.footer_div.build("span", {innerHTML: text }); },
+ clearDate:function() {
+ if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false;
+ var last_value = this.target_element.value;
+ this.target_element.value = "";
+ this.clearSelectedClass();
+ this.updateFooter(' ');
+ if (last_value!=this.target_element.value) this.callback("onchange");
+ },
updateSelectedDate:function(partsOrElement, via_click) {
var parts = $H(partsOrElement);
if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false;
@@ -417,7 +430,7 @@ CalendarDateSelect.prototype = {
Event.stopObserving(document, "keypress", this.keyPress_handler);
this.calendar_div.remove(); this.closed = true;
if (this.iframe) this.iframe.remove();
- if (this.target_element.type!="hidden") this.target_element.focus();
+ if (this.target_element.type != "hidden" && ! this.target_element.disabled) this.target_element.focus();
this.callback("after_close");
},
closeIfClickedOut: function(e) {
public/javascripts/calendar_date_select/calendar_date_select.js
@@ -8,10 +8,18 @@ Date.prototype.toFormattedString = function(include_time){
return str;
}
Date.parseFormattedString = function (string) {
- var regexp = '([0-9]{1,2})\.(([0-9]{1,2})\.(([0-9]{4})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
+ var regexp = '([0-9]{1,2})\.(([0-9]{1,2})\.(([0-9]{2,4})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
var d = string.match(new RegExp(regexp, "i"));
if (d==null) return Date.parse(string); // at least give javascript a crack at it.
var offset = 0;
+ if (d[5] && d[5].length == 2) {
+ // we got only two digits for the year...
+ d[5] = Number(d[5]);
+ if (d[5] > 30)
+ d[5] += 1900;
+ else
+ d[5] += 2000;
+ }
var date = new Date(d[5], 0, 1);
if (d[3]) { date.setMonth(d[3] - 1); }
if (d[5]) { date.setDate(d[1]); }
public/javascripts/calendar_date_select/format_finnish.js
@@ -1,36 +1,37 @@
-Date.prototype.toFormattedString = function(include_time){
- str = this.getFullYear() + "-" + Date.padded2(this.getMonth() + 1) + "-" +Date.padded2(this.getDate());
-
-if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() + " " + this.getAMPM() }
-return str;
-}
-
-Date.parseFormattedString = function (string) {
- var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" +
- "( ([0-9]{1,2}):([0-9]{2})? *(pm|am)" +
- "?)?)?)?";
- var d = string.match(new RegExp(regexp, "i"));
- if (d==null) return Date.parse(string); // at least give javascript a crack at it.
- var offset = 0;
- var date = new Date(d[1], 0, 1);
- if (d[3]) { date.setMonth(d[3] - 1); }
- if (d[5]) { date.setDate(d[5]); }
- 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;
- date.setHours(hours);
-
- }
- if (d[8]) { date.setMinutes(d[8]); }
- if (d[10]) { date.setSeconds(d[10]); }
- if (d[12]) { date.setMilliseconds(Number("0." + d[12]) * 1000); }
- if (d[14]) {
- offset = (Number(d[16]) * 60) + Number(d[17]);
- offset *= ((d[15] == '-') ? 1 : -1);
- }
-
- return date;
+Date.prototype.toFormattedString = function(include_time){
+ str = this.getFullYear() + "-" + Date.padded2(this.getMonth() + 1) + "-" +Date.padded2(this.getDate());
+
+if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() + " " + this.getAMPM() }
+return str;
+}
+
+Date.parseFormattedString = function (string) {
+ var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" +
+ "( ([0-9]{1,2}):([0-9]{2})? *(pm|am)" +
+ "?)?)?)?";
+ var d = string.match(new RegExp(regexp, "i"));
+ if (d==null) return Date.parse(string); // at least give javascript a crack at it.
+ var offset = 0;
+ var date = new Date(d[1], 0, 1);
+ if (d[3]) { date.setMonth(d[3] - 1); }
+ if (d[5]) { date.setDate(d[5]); }
+ if (d[7]) {
+ hours = parseInt(d[7], 10);
+ offset=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]); }
+ if (d[12]) { date.setMilliseconds(Number("0." + d[12]) * 1000); }
+ if (d[14]) {
+ offset = (Number(d[16]) * 60) + Number(d[17]);
+ offset *= ((d[15] == '-') ? 1 : -1);
+ }
+
+ return date;
}
\ No newline at end of file
public/javascripts/calendar_date_select/format_hyphen_ampm.js
@@ -3,7 +3,7 @@
Date.prototype.toFormattedString = function(include_time){
str = this.getDate() + "/" + (this.getMonth() + 1) + "/" + this.getFullYear();
- if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() }
+ if (include_time) { str += " " + this.getHours() + ":" + this.getPaddedMinutes() }
return str;
}
public/javascripts/calendar_date_select/format_italian.js
@@ -1,10 +1,11 @@
-Date.weekdays = $w('D S T Q Q S S');
-Date.months = $w('Janeiro Fevereiro Março Abril Maio Junho Julho Agosto Setembro Novembro Dezembro');
-
-Date.first_day_of_week = 0
-
-_translations = {
- "OK": "OK",
- "Now": "Agora",
- "Today": "Hoje"
-}
\ No newline at end of file
+Date.weekdays = $w('D S T Q Q S S');
+Date.months = $w('Janeiro Fevereiro Março Abril Maio Junho Julho Agosto Setembro Outubro Novembro Dezembro');
+
+Date.first_day_of_week = 0
+
+_translations = {
+ "OK": "OK",
+ "Now": "Agora",
+ "Today": "Hoje",
+ "Clear": "Limpar"
+}
public/javascripts/calendar_date_select/locale/pt.js
CHANGELOG
README
lib/gem_init.rb
lib/includes_helper.rb
test/functional/calendar_date_select_test.rb
test/functional/helper_methods_test.rb
test/test_helper.rb
71ec974bf96c332b9c171488ac2a77b406740ee0
b63886b73d25bbebd482abbfdacc29bac1b09f90
Edwin Moss
edwin.moss@gmail.com
http://github.com/edwinmoss/calendar_date_select/commit/e411f879880c3a08ec69e95895df146db1e7ba83
e411f879880c3a08ec69e95895df146db1e7ba83
2009-02-19T10:38:49-08:00
2009-02-19T10:38:49-08:00
Merge branch 'core'
Conflicts:
lib/calendar_date_select/includes_helper.rb
public/javascripts/calendar_date_select/format_hyphen_ampm.js
9f1f2bfd1da19463c5f024c13946cbbaa6cd3a03
Edwin Moss
edwin.moss@gmail.com