Merge lp:~mzanetti/reminders-app/still-that-focus into lp:reminders-app

[Michael Zanetti]

Fix 1452907

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

FAILED: Continuous integration, rev:431
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mzanetti/reminders-app/still-that-focus/+merge/258566/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/740/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2722
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2722/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/342/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/162

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Fixes the issues, thanks!

review: Approve

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

FAILED: Continuous integration, rev:431
http://91.189.93.70:8080/job/reminders-app-ci/742/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2724
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2724/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/344
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/164

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

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-05-07 21:46:21 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-05-07 21:46:21 +0000
@@ -629,8 +629,8 @@
                 text: i18n.tr("Done")
                 height: parent.height
                 iconColor: UbuntuColors.green
-                activeFocusOnPress: true
                 onClicked: {
+                    forceActiveFocus();
                     saveNote();
                     root.exitEditMode(root.note);
                 }