Merge lp:~rpadovani/reminders-app/fixForReload into lp:reminders-app

[Riccardo Padovani]

Fixed pull down to refresh behavior

Fixed this wrong behavior:

<mzanetti> rpadovani: I also found a bug with the pulldown thingie
<mzanetti> rpadovani: pull it down to make the text change to "release to refresh"
<mzanetti> rpadovani: then drag it back up to the beginning and release
<mzanetti> it still refreshes
<mzanetti> should only if you release it below the threshold

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

PASSED: Continuous integration, rev:217
http://91.189.93.70:8080/job/reminders-app-ci/478/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1520
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1520/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/174

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/478/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

much better

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/241/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1738/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1738/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/133

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/243/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1800/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1800/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/135

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/components/PulldownListView.qml'
--- src/app/qml/components/PulldownListView.qml	2014-07-23 21:39:44 +0000
+++ src/app/qml/components/PulldownListView.qml	2014-08-14 11:08:44 +0000
@@ -47,8 +47,13 @@
     }
 
     onContentYChanged: {
-        if (priv.wasAtYBeginning && priv.initialContentY - contentY > units.gu(5)) {
-            priv.toBeReloaded = true
+        if (dragging) {
+            if (priv.wasAtYBeginning && priv.initialContentY - contentY > units.gu(5)) {
+                priv.toBeReloaded = true
+            }
+            else {
+                priv.toBeReloaded = false
+            }
         }
     }