Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/fix-empty-state-warnings into lp:ubuntu-clock-app

  1. fix-empty-state-warnings
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan on 2015-05-26
Status: Merged
Approved by: Riccardo Padovani on 2015-05-27
Approved revision: 268
Merged at revision: 269
Proposed branch: lp:~nik90/ubuntu-clock-app/fix-empty-state-warnings
Merge into: lp:ubuntu-clock-app
Diff against target: 39 lines (+5/-2)
3 files modified
app/components/EmptyState.qml (+0/-1)
debian/changelog (+4/-0)
po/com.ubuntu.clock.pot (+1/-1)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/fix-empty-state-warnings
Reviewer Review Type Date Requested Status
Riccardo Padovani 2015-05-26 Approve on 2015-05-27
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-05-26
Review via email: mp+260173@code.launchpad.net

Commit Message

Fixed empty state component warning.

Description of the Change

Fixed empty state component warning "file:///opt/click.ubuntu.com/com.ubuntu.clock/3.3./share/qml/components/EmptyState.qml:36: TypeError: Cannot read property of null" which was caused due to parent being null when the loader is unloaded.

This was fixed by removing width: parent.width since the component automatically fills the width and height of the loader and as such doesn't require an explicit declaration of size within the component itself.

Note: I also added the debian changelog entry for a previous MP that was missing it.

To post a comment you must log in.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Riccardo Padovani (rpadovani) wrote :

Makes sense, thanks!

review: Approve
Nekhelesh Ramananthan (nik90) wrote :

Thnx for the review.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/EmptyState.qml'
2--- app/components/EmptyState.qml 2015-03-05 15:53:53 +0000
3+++ app/components/EmptyState.qml 2015-05-26 14:44:13 +0000
4@@ -33,7 +33,6 @@
5 property alias subTitle: emptySublabel.text
6
7 height: childrenRect.height
8- width: parent.width
9
10 Icon {
11 id: emptyIcon
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2015-05-15 16:44:13 +0000
15+++ debian/changelog 2015-05-26 14:44:13 +0000
16@@ -21,6 +21,10 @@
17 * Fixed "Location service error" label being shown when user denies clock app
18 location access (LP: #1393827)
19 * Increased date font size (LP: #1432736)
20+ * Fixed empty state component width warnings
21+
22+ [Penk Chen]
23+ * Fixed DigitalMode time being empty in chineese locale (LP: #1458808)
24
25 [Brendan Donegan]
26 * Fixed AP failure by waiting for the bottom edge tip visible property to be true
27
28=== modified file 'po/com.ubuntu.clock.pot'
29--- po/com.ubuntu.clock.pot 2015-05-15 16:38:24 +0000
30+++ po/com.ubuntu.clock.pot 2015-05-26 14:44:13 +0000
31@@ -8,7 +8,7 @@
32 msgstr ""
33 "Project-Id-Version: \n"
34 "Report-Msgid-Bugs-To: \n"
35-"POT-Creation-Date: 2015-05-15 16:30+0000\n"
36+"POT-Creation-Date: 2015-05-26 14:38+0000\n"
37 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
38 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
39 "Language-Team: LANGUAGE <LL@li.org>\n"

Subscribers

People subscribed via source and target branches