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

Proposed by Kunal Parmar
Status: Merged
Approved by: Mihir Soni
Approved revision: 536
Merged at revision: 537
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/RefreshIssue
Merge into: lp:ubuntu-calendar-app
Diff against target: 50 lines (+12/-10)
2 files modified
TimeLineBase.qml (+11/-0)
TimeLineBaseComponent.qml (+1/-10)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/RefreshIssue
Reviewer Review Type Date Requested Status
Mihir Soni Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+240850@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good to me.
Thanks kunal

Revision history for this message
Mihir Soni (mihirsoni) wrote :

LGTM !

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
27 property int hourHeight: units.gu(10)27 property int hourHeight: units.gu(10)
28 property var model;28 property var model;
2929
30 Component.onCompleted: {
31 bubbleOverLay.createEvents();
32 model.addModelChangeListener(destroyAllChildren);
33 model.addModelChangeListener(createEvents);
34 }
35
36 Component.onDestruction: {
37 model.removeModelChangeListener(destroyAllChildren);
38 model.removeModelChangeListener(createEvents);
39 }
40
30 MouseArea {41 MouseArea {
31 anchors.fill: parent42 anchors.fill: parent
32 objectName: "mouseArea"43 objectName: "mouseArea"
3344
=== 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 @@
151 height: parent.height151 height: parent.height
152 delegate: comp152 delegate: comp
153 day: startDay.addDays(index)153 day: startDay.addDays(index)
154 model: mainModel
154155
155 Loader{156 Loader{
156 objectName: "weekdevider"157 objectName: "weekdevider"
@@ -173,16 +174,6 @@
173 destroyAllChildren();174 destroyAllChildren();
174 }175 }
175 }176 }
176
177 model: mainModel
178 Component.onCompleted: {
179 model.addModelChangeListener(destroyAllChildren);
180 model.addModelChangeListener(createEvents);
181 }
182 Component.onDestruction: {
183 model.removeModelChangeListener(destroyAllChildren);
184 model.removeModelChangeListener(createEvents);
185 }
186 }177 }
187 }178 }
188 }179 }

Subscribers

People subscribed via source and target branches

to status/vote changes: