Skip to content
This repository
Browse code

Merge commit 'upstream/master'

  • Loading branch information...
commit 96d3dc524ff9fc68eb413c0b395f45d3e81eb53b 2 parents 4855fa0 + aa14a2d
Shih-gian Lee authored March 15, 2010
22  History.txt
... ...
@@ -1,3 +1,25 @@
  1
+== Version 1.15.2
  2
+
  3
+* Fix for set date (day must go last) (ujifgc)
  4
+* added logic to wrap image in span tag when there is error fields. (Shih-gian Lee)
  5
+* Initial commit of default time implementation. (Shih-gian Lee)
  6
+* default time implementation in form_helpers.rb. (Shih-gian Lee)
  7
+* Fix calendar_date_select helper for searchlogic compatibility (Andrea Frigido)
  8
+* Added Arabic language translations (Abdul-Jabbar Shalabi)
  9
+* rename instance variable. avoid conflict with name (Cyril Mougel)
  10
+* add translation in french (Cyril Mougel)
  11
+* Adding Slovenian sl-sl locale. (Miha Rebernik)
  12
+* Added danish format (Jacob Kjeldahl)
  13
+* translations for NL (Gert van der Spoel)
  14
+* new color scheme 'green' (Gert van der Spoel)
  15
+* Fixed missing translation in polish locales (Witold Rugowski)
  16
+* Added a italian locale (Andrea Frigido)
  17
+* fix time handling (Robert Brown)
  18
+* Added a spanish locale on public/javascripts/calendar_date_select/locale/es.js (kikito)
  19
+* Added description for iso date format (Lars E. Hoeg)
  20
+* Added Danish (da) translation (Lars E. Hoeg)
  21
+* Fixes issue with nil dates and trying to call type on them (Matt Haley)
  22
+
1 23
 == Version 1.15.1
2 24
  * Bugfix: iso_date fixes (Robert Brown)
3 25
 
2  VERSION
... ...
@@ -1 +1 @@
1  
-1.0.0
  1
+1.5.2
68  calendar_date_select.gemspec
... ...
@@ -1,22 +1,80 @@
  1
+# Generated by jeweler
  2
+# DO NOT EDIT THIS FILE DIRECTLY
  3
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
1 4
 # -*- encoding: utf-8 -*-
2 5
 
3 6
 Gem::Specification.new do |s|
4 7
   s.name = %q{calendar_date_select}
5  
-  s.version = "1.0.0"
  8
+  s.version = "1.5.2"
6 9
 
7 10
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8 11
   s.authors = ["Enrique Garcia Cota (kikito)", "Tim Charper", "Lars E. Hoeg"]
9  
-  s.date = %q{2009-07-29}
  12
+  s.date = %q{2010-03-14}
10 13
   s.description = %q{calendar_date_select fork; includes highlighting}
11 14
   s.email = %q{egarcia@splendeo.es}
12 15
   s.extra_rdoc_files = [
13 16
     "README.txt"
14 17
   ]
15  
-  s.has_rdoc = true
  18
+  s.files = [
  19
+    ".gitignore",
  20
+     "History.txt",
  21
+     "MIT-LICENSE",
  22
+     "Manifest.txt",
  23
+     "README.txt",
  24
+     "Rakefile",
  25
+     "VERSION",
  26
+     "calendar_date_select.gemspec",
  27
+     "init.rb",
  28
+     "js_test/functional/.tmp_cds_test.html",
  29
+     "js_test/functional/cds_test.html",
  30
+     "js_test/functional/format_iso_date_test.html",
  31
+     "js_test/prototype.js",
  32
+     "js_test/test.css",
  33
+     "js_test/unit/cds_helper_methods.html",
  34
+     "js_test/unittest.js",
  35
+     "lib/calendar_date_select.rb",
  36
+     "lib/calendar_date_select/calendar_date_select.rb",
  37
+     "lib/calendar_date_select/form_helpers.rb",
  38
+     "lib/calendar_date_select/includes_helper.rb",
  39
+     "public/blank_iframe.html",
  40
+     "public/images/calendar_date_select/calendar.gif",
  41
+     "public/javascripts/calendar_date_select/calendar_date_select.js",
  42
+     "public/javascripts/calendar_date_select/format_american.js",
  43
+     "public/javascripts/calendar_date_select/format_danish.js",
  44
+     "public/javascripts/calendar_date_select/format_db.js",
  45
+     "public/javascripts/calendar_date_select/format_euro_24hr.js",
  46
+     "public/javascripts/calendar_date_select/format_euro_24hr_ymd.js",
  47
+     "public/javascripts/calendar_date_select/format_finnish.js",
  48
+     "public/javascripts/calendar_date_select/format_hyphen_ampm.js",
  49
+     "public/javascripts/calendar_date_select/format_iso_date.js",
  50
+     "public/javascripts/calendar_date_select/format_italian.js",
  51
+     "public/javascripts/calendar_date_select/locale/ar.js",
  52
+     "public/javascripts/calendar_date_select/locale/da.js",
  53
+     "public/javascripts/calendar_date_select/locale/de.js",
  54
+     "public/javascripts/calendar_date_select/locale/es.js",
  55
+     "public/javascripts/calendar_date_select/locale/fi.js",
  56
+     "public/javascripts/calendar_date_select/locale/fr.js",
  57
+     "public/javascripts/calendar_date_select/locale/it.js",
  58
+     "public/javascripts/calendar_date_select/locale/nl.js",
  59
+     "public/javascripts/calendar_date_select/locale/pl.js",
  60
+     "public/javascripts/calendar_date_select/locale/pt.js",
  61
+     "public/javascripts/calendar_date_select/locale/ru.js",
  62
+     "public/javascripts/calendar_date_select/locale/sl.js",
  63
+     "public/stylesheets/calendar_date_select/blue.css",
  64
+     "public/stylesheets/calendar_date_select/default.css",
  65
+     "public/stylesheets/calendar_date_select/green.css",
  66
+     "public/stylesheets/calendar_date_select/plain.css",
  67
+     "public/stylesheets/calendar_date_select/red.css",
  68
+     "public/stylesheets/calendar_date_select/silver.css",
  69
+     "spec/calendar_date_select/calendar_date_select_spec.rb",
  70
+     "spec/calendar_date_select/form_helpers_spec.rb",
  71
+     "spec/calendar_date_select/includes_helper_spec.rb",
  72
+     "spec/spec_helper.rb"
  73
+  ]
16 74
   s.homepage = %q{http://github.com/kikito/calendar_date_select}
17 75
   s.rdoc_options = ["--charset=UTF-8"]
18 76
   s.require_paths = ["lib"]
19  
-  s.rubygems_version = %q{1.3.1}
  77
+  s.rubygems_version = %q{1.3.5}
20 78
   s.summary = %q{calendar_date_select fork; includes highlighting}
21 79
   s.test_files = [
22 80
     "spec/calendar_date_select/calendar_date_select_spec.rb",
@@ -27,7 +85,7 @@ Gem::Specification.new do |s|
27 85
 
28 86
   if s.respond_to? :specification_version then
29 87
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
30  
-    s.specification_version = 2
  88
+    s.specification_version = 3
31 89
 
32 90
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
33 91
     else
2  lib/calendar_date_select/form_helpers.rb
@@ -86,7 +86,7 @@ module CalendarDateSelect::FormHelpers
86 86
   #     :before_close => "log('Calendar closing');" ,
87 87
   #     :after_close => "log('Calendar closed');",
88 88
   #     :after_navigate => "log('Current month is ' + (param.getMonth()+1) + '/' + (param.getFullYear()));",
89  
-  #     :onchange => "log('value changed to - ' + $F(this));"
  89
+  #     :onchange => "log('value changed to - ' + $F(this));" %>
90 90
   # 
91 91
   # }}}
92 92
   # 
2  public/javascripts/calendar_date_select/calendar_date_select.js
@@ -360,9 +360,9 @@ CalendarDateSelect.prototype = {
360 360
     if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false;
361 361
     if (parts.get("day")) {
362 362
       var t_selected_date = this.selected_date, vdc = this.options.get("valid_date_check");
363  
-      for (var x = 0; x<=3; x++) t_selected_date.setDate(parts.get("day"));
364 363
       t_selected_date.setYear(parts.get("year"));
365 364
       t_selected_date.setMonth(parts.get("month"));
  365
+      t_selected_date.setDate(parts.get("day"));
366 366
       
367 367
       if (vdc && ! vdc(t_selected_date.stripTime())) { return false; }
368 368
       this.selected_date = t_selected_date;

0 notes on commit 96d3dc5

Please sign in to comment.
Something went wrong with that request. Please try again.