svn commit: r818065 - in /ofbiz/branches/release09.04: ./ framework/images/webapp/images/calendar_date_select.js

Author: jleroux
Date: Wed Sep 23 11:32:31 2009
New Revision: 818065

URL: http://svn.apache.org/viewvc?rev=818065&view=rev
Log:
"Applied fix from trunk for revision: 818049"
------------------------------------------------------------------------
r818049 | jleroux | 2009-09-23 12:50:35 +0200 (mer. 23 sept. 2009) | 4 lignes

A patch from Jeremy Wickersheimer "calendar picker does not parse the selected date correctly" (https://issues.apache.org/jira/browse/OFBIZ-2965) - OFBIZ-2965

The side effect is that the calendar will default to today's date.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/framework/images/webapp/images/calendar_date_select.js

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 23 11:32:31 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810
 832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049

Modified: ofbiz/branches/release09.04/framework/images/webapp/images/calendar_date_select.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/images/webapp/images/calendar_date_select.js?rev=818065&r1=818064&r2=818065&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/images/webapp/images/calendar_date_select.js (original)
+++ ofbiz/branches/release09.04/framework/images/webapp/images/calendar_date_select.js Wed Sep 23 11:32:31 2009
@@ -450,24 +450,25 @@
     var str_date = arr_datetime[0];
     var str_time = arr_datetime[1];
 
- var arr_date = str_date.split('-');
- var dt_date = new Date();
- dt_date.setDate(1);
- dt_date.setMonth(arr_date[1]-1);
+    var arr_date = str_date.split('-');
+    var dt_date = new Date();
+    dt_date.setDate(1);
+    dt_date.setMonth(arr_date[1]-1);
     if (arr_date[0] < 100) arr_date[2] = Number(arr_date[0]) + (arr_date[0] < 40 ? 2000 : 1900);
     dt_date.setFullYear(arr_date[0]);
- var dt_numdays = new Date(arr_date[0], arr_date[1], 0);
- dt_date.setDate(arr_date[2]);
+    var dt_numdays = new Date(arr_date[0], arr_date[1], 0);
+    dt_date.setDate(arr_date[2]);
 
- var arr_time = String(str_time ? str_time : '').split(':');
-    dt_date.setHours(arr_time[0]);
-    dt_date.setMinutes(arr_time[1]);
-    var arr_sec = String(arr_time[2] ? arr_time[2] : '').split('.');
-    dt_date.setSeconds(arr_sec[0]);
- if (!arr_sec[1]) dt_date.setMilliseconds(0);
-    dt_date.setMilliseconds(arr_sec[1]);
-
- return dt_date;
+    var arr_time = String(str_time ? str_time : '').split(':');
+    if (arr_time.size() >= 1 && arr_time[0] != '') {
+      dt_date.setHours(arr_time[0]);
+      dt_date.setMinutes(arr_time[1]);
+      var arr_sec = String(arr_time[2] ? arr_time[2] : '').split('.');
+      dt_date.setSeconds(arr_sec[0]);
+      if (!arr_sec[1]) dt_date.setMilliseconds(0);
+      dt_date.setMilliseconds(arr_sec[1]);
+    }
+    return dt_date;
 };
 
 // OFBiz addition: functions to call the calendar
@@ -477,4 +478,4 @@
 
 function call_cal_notime(target, datetime) {
     new CalendarDateSelect(target, {year_range:10} );
-}
\ No newline at end of file
+}