[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.0/kdelibs/kjs
From:       Harri Porten <porten () kde ! org>
Date:       2008-01-13 2:47:38
Message-ID: 1200192458.081647.13019.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 760608 by porten:

Improper NaN/missing arg handling uncovered by Acid 3 test.


 M  +3 -3      date_object.cpp  


--- branches/KDE/4.0/kdelibs/kjs/date_object.cpp #760607:760608
@@ -688,13 +688,13 @@
   case SetSeconds:
   case SetMinutes:
   case SetHours:
-    ms = setTimeFields(exec, args, id, ms, &t);
+    ms = args.size() > 0 ? setTimeFields(exec, args, id, ms, &t) : NaN;
     break;
 
   case SetDate:
   case SetMonth:
   case SetFullYear:
-    ms = setDateFields(exec, args, id, ms, &t);
+    ms = args.size() > 0 ? setDateFields(exec, args, id, ms, &t) : NaN;
     break;
 
   case SetYear: {
@@ -707,7 +707,7 @@
   if (id == SetYear || id == SetMilliSeconds || id == SetSeconds ||
       id == SetMinutes || id == SetHours || id == SetDate ||
       id == SetMonth || id == SetFullYear ) {
-    result = jsNumber(makeTime(&t, ms, utc));
+    result = jsNumber(isnan(ms) ? ms : makeTime(&t, ms, utc));
     thisDateObj->setInternalValue(result);
   }
 
[prev in list] [next in list] [prev in thread] [next in thread]