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

[Kunal Parmar]

Now that Timeline views are loaded asynchronously, we need to add refresh events on Object creation

Now that Timeline views are loaded asynchronously, we need to add refresh events on Object creation

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

PASSED: Continuous integration, rev:536
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1009/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/40
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/6

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks kunal

[Mihir Soni (mihirsoni)]

LGTM !

review: Approve

=== modified file 'TimeLineBase.qml'
--- TimeLineBase.qml	2014-10-21 20:51:00 +0000
+++ TimeLineBase.qml	2014-11-06 13:51:23 +0000
@@ -27,6 +27,17 @@
     property int hourHeight: units.gu(10)
     property var model;
 
+    Component.onCompleted: {
+        bubbleOverLay.createEvents();
+        model.addModelChangeListener(destroyAllChildren);
+        model.addModelChangeListener(createEvents);
+    }
+
+    Component.onDestruction: {
+        model.removeModelChangeListener(destroyAllChildren);
+        model.removeModelChangeListener(createEvents);
+    }
+
     MouseArea {
         anchors.fill: parent
         objectName: "mouseArea"

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-10-22 18:46:59 +0000
+++ TimeLineBaseComponent.qml	2014-11-06 13:51:23 +0000
@@ -151,6 +151,7 @@
                         height: parent.height
                         delegate: comp
                         day: startDay.addDays(index)
+                        model: mainModel
 
                         Loader{
                             objectName: "weekdevider"
@@ -173,16 +174,6 @@
                                 destroyAllChildren();
                             }
                         }
-
-                        model: mainModel
-                        Component.onCompleted: {
-                            model.addModelChangeListener(destroyAllChildren);
-                            model.addModelChangeListener(createEvents);
-                        }
-                        Component.onDestruction: {
-                            model.removeModelChangeListener(destroyAllChildren);
-                            model.removeModelChangeListener(createEvents);
-                        }
                     }
                 }
             }