Merge lp:~renatofilho/ubuntu-calendar-app/fix-url-arg into lp:ubuntu-calendar-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Arthur Mello
Approved revision: 796
Merged at revision: 799
Proposed branch: lp:~renatofilho/ubuntu-calendar-app/fix-url-arg
Merge into: lp:ubuntu-calendar-app
Diff against target: 31 lines (+9/-5)
1 file modified
calendar.qml (+9/-5)
To merge this branch: bzr merge lp:~renatofilho/ubuntu-calendar-app/fix-url-arg
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+289885@code.launchpad.net

Commit message

Show correct date and time when url handler is invoked with the app open.

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Arthur Mello (artmello) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'calendar.qml'
--- calendar.qml 2016-03-22 20:28:17 +0000
+++ calendar.qml 2016-03-23 12:00:03 +0000
@@ -126,7 +126,11 @@
126 handleUri(uris[0])126 handleUri(uris[0])
127 if (tabs.starttime !== -1) {127 if (tabs.starttime !== -1) {
128 tabs.currentDay = new Date(tabs.starttime);128 tabs.currentDay = new Date(tabs.starttime);
129 tabs.selectedTabIndex = dayTab.index129 if (tabs.selectedTabIndex != dayTab.index)
130 tabs.selectedTabIndex = dayTab.index
131 else {
132 dayTab.page.item.showDate(tabs.currentDay)
133 }
130 tabs.starttime = -1134 tabs.starttime = -1
131 }135 }
132 }136 }
@@ -735,10 +739,10 @@
735 function showDate(date)739 function showDate(date)
736 {740 {
737 var dateGoTo = new Date(date)741 var dateGoTo = new Date(date)
738 if (!anchorDate ||742 if (!currentDate ||
739 (dateGoTo.getFullYear() != anchorDate.getFullYear()) ||743 (dateGoTo.getFullYear() !== currentDate.getFullYear()) ||
740 (dateGoTo.getMonth() != anchorDate.getMonth()) ||744 (dateGoTo.getMonth() !== currentDate.getMonth()) ||
741 (dateGoTo.getDate() != anchorDate.getDate())) {745 (dateGoTo.getDate() !== currentDate.getDate())) {
742 anchorDate = new Date(dateGoTo)746 anchorDate = new Date(dateGoTo)
743 }747 }
744 delayScrollToDate(dateGoTo)748 delayScrollToDate(dateGoTo)

Subscribers

People subscribed via source and target branches

to status/vote changes: