Merge lp:~ahayzen/ubuntu-weather-app/fix-click-locations-list into lp:ubuntu-weather-app

[Andrew Hayzen]

* Fix clicking on a location in the bottom edge not popping the bottom edge

* Fix clicking on a location in the bottom edge not popping the bottom edge

TESTING:
1) Ensure you have two locations
2) Open the bottom edge
3) Click on a location
4) The bottom edge should dismiss and the view switch to the chosen location

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:269
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/81/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/1048/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/weather-app-ci/81/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good :)

review: Approve

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2017-04-12 15:48:27 +0000
+++ app/ui/LocationsPage.qml	2017-04-18 09:09:34 +0000
@@ -73,7 +73,7 @@
 
                 onItemClicked: {
                     settings.current = index;
-                    pageStack.pop()
+                    locationsPage.pop()
                 }
 
                 Column {
@@ -161,7 +161,7 @@
                     settings.current = index;
                 }
 
-                pageStack.pop()
+                locationsPage.pop()
             }
             onReorder: {
                 console.debug("Move: ", from, to);