Browse files

Merge branch 'master' of git://github.com/timcharper/calendar_date_se…

…lect into next
  • Loading branch information...
2 parents 475d563 + 318cbaf commit 8843ed471b877a62bd5c20649f8062df5edc9a50 @sglee77 sglee77 committed May 9, 2010
View
8 History.txt
@@ -1,3 +1,11 @@
+== Version 1.16.1
+
+* 1.16 was a lemon release. Sorry! Deploy script had an error and messed up the code on the way out.
+
+== Version 1.16
+
+* Ability to specify a default time/date if no time/date is selected in the target form element. (Shih-gian Lee)
+
== Version 1.15.2
* Fix for set date (day must go last) (ujifgc)
View
23 Rakefile
@@ -5,26 +5,27 @@ begin
require 'jeweler'
Jeweler::Tasks.new do |gemspec|
gemspec.name = "calendar_date_select"
- gemspec.summary = "calendar_date_select fork; includes highlighting"
- gemspec.description = "This is a fork of the original calendar_date_select, including the additional feature of highlighting dates on the calendar without disabling other dates"
- gemspec.email = "egarcia@splendeo.es"
- gemspec.homepage = "http://github.com/kikito/calendar_date_select"
- gemspec.description = "calendar_date_select fork; includes highlighting"
- gemspec.authors = ["Enrique Garcia Cota (kikito)", "Tim Charper", "Lars E. Hoeg"]
+ gemspec.version = File.read("VERSION").strip
+ gemspec.summary = "Calendar date picker for rails"
+ gemspec.description = "Calendar date picker for rails"
+ gemspec.email = ""
+ gemspec.homepage = "http://github.com/timcharper/calendar_date_select"
+ gemspec.authors = ["Shih-gian Lee", "Enrique Garcia Cota (kikito)", "Tim Charper", "Lars E. Hoeg"]
end
rescue LoadError
- puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+ puts "Jeweler not available. Install it with: sudo gem install jeweler"
end
-desc "Set the current gem version in the code (VERSION=version)"
+desc "Set the current gem version in the code according to the VERSION file"
task :set_version do
+ VERSION=File.read("VERSION").strip
["lib/calendar_date_select/calendar_date_select.rb", "public/javascripts/calendar_date_select/calendar_date_select.js"].each do |file|
abs_file = File.dirname(__FILE__) + "/" + file
- src = File.read(abs_file);
+ src = File.read(abs_file)
src = src.map do |line|
case line
- when /^ *VERSION/ then " VERSION = '#{ENV['VERSION']}'\n"
- when /^\/\/ CalendarDateSelect version / then "// CalendarDateSelect version #{ENV['VERSION']} - a prototype based date picker\n"
+ when /^ *VERSION/ then " VERSION = '#{VERSION}'\n"
+ when /^\/\/ CalendarDateSelect version / then "// CalendarDateSelect version #{VERSION} - a prototype based date picker\n"
else
line
end
View
2 VERSION
@@ -1 +1 @@
-1.5.2
+1.16.1
View
16 calendar_date_select.gemspec
@@ -5,13 +5,13 @@
Gem::Specification.new do |s|
s.name = %q{calendar_date_select}
- s.version = "1.5.2"
+ s.version = "1.16.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.authors = ["Enrique Garcia Cota (kikito)", "Tim Charper", "Lars E. Hoeg"]
- s.date = %q{2010-03-14}
- s.description = %q{calendar_date_select fork; includes highlighting}
- s.email = %q{egarcia@splendeo.es}
+ s.authors = ["Shih-gian Lee", "Enrique Garcia Cota (kikito)", "Tim Charper", "Lars E. Hoeg"]
+ s.date = %q{2010-03-29}
+ s.description = %q{Calendar date picker for rails}
+ s.email = %q{}
s.extra_rdoc_files = [
"README.txt"
]
@@ -71,11 +71,11 @@ Gem::Specification.new do |s|
"spec/calendar_date_select/includes_helper_spec.rb",
"spec/spec_helper.rb"
]
- s.homepage = %q{http://github.com/kikito/calendar_date_select}
+ s.homepage = %q{http://github.com/timcharper/calendar_date_select}
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
- s.rubygems_version = %q{1.3.5}
- s.summary = %q{calendar_date_select fork; includes highlighting}
+ s.rubygems_version = %q{1.3.6}
+ s.summary = %q{Calendar date picker for rails}
s.test_files = [
"spec/calendar_date_select/calendar_date_select_spec.rb",
"spec/calendar_date_select/form_helpers_spec.rb",
View
3 lib/calendar_date_select/calendar_date_select.rb
@@ -1,5 +1,6 @@
module CalendarDateSelect
- VERSION = '1.15'
+ VERSION = '1.16.1'
+
FORMATS = {
:natural => {
:date => "%B %d, %Y",
View
2 public/javascripts/calendar_date_select/calendar_date_select.js
@@ -1,4 +1,4 @@
-// CalendarDateSelect version 1.15 - a prototype based date picker
+// CalendarDateSelect version 1.16.1 - 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");
View
9 public/javascripts/calendar_date_select/locale/sv.js
@@ -0,0 +1,9 @@
+Date.weekdays = $w('Må Ti On To Fr Lö Sö');
+Date.months = $w('Januari Februari Mars April Maj Juni Juli Augusti September Oktober November December');
+Date.first_day_of_week = 1;
+_translations = {
+ "OK": "OK",
+ "Now": "Nu",
+ "Today": "Idag",
+ "Clear": "Avbryt"
+}
View
4 spec/spec_helper.rb
@@ -2,7 +2,7 @@
require 'spec'
-gem 'activesupport', "2.3.4"
+gem 'activesupport', "~> 2.3.5"
gem 'actionpack', ">= 2.2.0"
require 'active_support'
@@ -23,4 +23,4 @@ class String
def to_regexp
is_a?(Regexp) ? self : Regexp.new(Regexp.escape(self.to_s))
end
-end
+end

0 comments on commit 8843ed4

Please sign in to comment.