Merge lp:~pkunal-parmar/ubuntu-calendar-app/IncubteObject into lp:ubuntu-calendar-app

[Kunal Parmar]

using incubate object to create bubble object

using incubate object to create bubble object

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:539
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1019/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/86
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/16

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1019/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:539
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1024/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/141
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/21

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1024/rebuild

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me !!
Thanks kunal

review: Approve

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2014-11-06 13:49:22 +0000
+++ TimeLineBase.qml	2014-11-08 02:18:28 +0000
@@ -169,12 +169,25 @@
     function createEvent( event, depth, sizeOfRow ) {
         var eventBubble;
         if( isHashEmpty(intern.unUsedEvents) ) {
-            eventBubble = delegate.createObject(bubbleOverLay);
-            eventBubble.objectName = children.length;
+            var incubator = delegate.incubateObject(bubbleOverLay);
+            if (incubator.status !== Component.Ready) {
+                incubator.onStatusChanged = function(status) {
+                    if (status === Component.Ready) {
+                        incubator.object.objectName = children.length;
+                        assignBubbleProperties(incubator.object, event, depth, sizeOfRow);
+                    }
+                }
+            } else {
+                incubator.object.objectName = children.length;
+                assignBubbleProperties(incubator.object, event, depth, sizeOfRow);
+            }
         } else {
             eventBubble = getUnusedEventBubble();
+            assignBubbleProperties(eventBubble, event, depth, sizeOfRow);
         }
+    }
 
+    function assignBubbleProperties(eventBubble, event, depth, sizeOfRow) {
         var hour = event.startDateTime.getHours();
         var yPos = (( event.startDateTime.getMinutes() * hourHeight) / 60) + hour * hourHeight
         eventBubble.y = yPos;