X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCalendar%2FJSCalendarItemProperties.cpp;h=20bad9574f84bfbeee720c9d8121f5a214a29ec8;hb=699166950f4817516693be01115b6285d7e07f1c;hp=7f2cca0f97ac4a44c6273b4af815059e0d95f24e;hpb=9da05be8e3d6b0fdb36d2dabe2001ca7318ebba1;p=platform%2Fframework%2Fweb%2Fwrt-plugins-tizen.git

diff --git a/src/Calendar/JSCalendarItemProperties.cpp b/src/Calendar/JSCalendarItemProperties.cpp
index 7f2cca0..20bad95 100755
--- a/src/Calendar/JSCalendarItemProperties.cpp
+++ b/src/Calendar/JSCalendarItemProperties.cpp
@@ -806,16 +806,28 @@ JSValueRef JSCalendarItemProperties::getPropertyDuration(JSContextRef context,
     Try
     {
         CalendarEventPtr item = getPrivateObject(object);
+        TimeUtilConverter converter(context);
+
+		DurationProperties duration;
+		if(UNDEFINED_TIME!=item->getDuration()->length) {
+			duration.length = item->getDuration()->length;
+			duration.unit = item->getDuration()->unit;
+			LoggerD("Duration length: "<<duration.length<<", unit: "<<duration.unit);
+			return converter.makeDurationObject( duration );
+		}
 
+		// Alternatively generate the duration object using start/end time.
 		if(UNDEFINED_TIME==item->getStartTime() || UNDEFINED_TIME==item->getEndTime()) {
 			LoggerD("Start or end time is not defined.");
 		    return JSValueMakeUndefined(context);
 		}
 
-        TimeUtilConverter converter(context);
         long long length = item->getEndTime() - item->getStartTime(); // in seconds only
         LoggerD("item->getStartTime():"<< item->getStartTime() << ", length:" << length);
-        return converter.makeMillisecondDurationObject( length*1000 );
+		duration.length = length;
+		duration.unit = SECONDS_UNIT;
+
+        return converter.makeDurationObject( duration );
     }
     Catch(Exception)
     {
@@ -855,6 +867,9 @@ bool JSCalendarItemProperties::setPropertyDuration(JSContextRef context,
             return false;
         }
 
+		event->getDuration()->length = length;
+		event->getDuration()->unit = unit;
+
         return true;
     }
     Catch(Exception)