Added logic to set selection_mode to true when default_time is present.

dosire · Mar 15, 2010 · b55f6fa · b55f6fa
1 parent 028d941
commit b55f6fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/js_test/functional/cds_test.html b/js_test/functional/cds_test.html
@@ -221,15 +221,15 @@
       cds = new CalendarDateSelect($("cds_test"), {default_time:function() { return new Date('January 02, 2008 2:00 PM') }});
       assertEqual('2008', cds.selected_date.getFullYear());
       assertEqual('2008', cds.date.getFullYear());
-      assert(! cds.selection_made)
+      assert(cds.selection_made)
       cds.close();
     }},
     test_parseDate_defaultTime_javaScriptDatePassed_shouldReturnJavaScriptDate: function() {with(this){
       $("cds_test").value = " ";
       cds = new CalendarDateSelect($("cds_test"), {default_time:new Date('January 02, 2007 05:45 PM') });
       assertEqual('2007', cds.selected_date.getFullYear());
       assertEqual('2007', cds.date.getFullYear());
-      assert(! cds.selection_made)
+      assert(cds.selection_made)
       cds.close();
     }},
     test_passDivElement__shouldUseChildInputForTargetElement: function() {with(this){

diff --git a/public/javascripts/calendar_date_select/calendar_date_select.js b/public/javascripts/calendar_date_select/calendar_date_select.js
@@ -334,7 +334,7 @@ CalendarDateSelect.prototype = {
   {
     var value = $F(this.target_element).strip()
     var default_time = this.options.get("default_time");
-    this.selection_made = (value != "");
+    this.selection_made = (value != "" || default_time);
     this.date = value=="" ? NaN : Date.parseFormattedString(this.options.get("date") || value);
     if (isNaN(this.date) && !default_time)
         this.date = new Date();