Merge lp:~mzanetti/reminders-app/fix-edit-button into lp:reminders-app

[Michael Zanetti]

fix the edit button

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

PASSED: Continuous integration, rev:551
https://core-apps-jenkins.ubuntu.com/job/reminders-app-ci/52/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/880/console

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested on my bq e4.5 and it works! Thanks!

review: Approve

=== modified file 'src/app/qml/Reminders.qml'
--- src/app/qml/Reminders.qml	2016-03-01 14:57:01 +0000
+++ src/app/qml/Reminders.qml	2016-04-29 08:41:12 +0000
@@ -158,7 +158,7 @@
                 })
             } else {
                 var page = pagestack.push(Qt.createComponent(Qt.resolvedUrl("ui/NotePage.qml")), {readOnly: conflictMode, note: note })
-                page.editNote.connect(function(note) {root.switchToEditMode(note)})
+                page.editNote.connect(function() {root.switchToEditMode(note)})
             }
         } else {
             var view;
@@ -189,11 +189,12 @@
         if (root.narrowMode) {
             if (pagestack.depth > 1) {
                 pagestack.pop();
+                var page = pagestack.push(Qt.resolvedUrl("ui/EditNotePage.qml"), {note: note, newNote: false});
+                page.exitEditMode.connect(function() {Qt.inputMethod.hide(); pagestack.pop();});
             }
         } else {
             sideViewLoader.clear();
             var view = sideViewLoader.embed(Qt.resolvedUrl("ui/EditNoteView.qml"))
-            print("--- setting note:", note)
             view.note = note;
             view.exitEditMode.connect(function(note) {root.displayNote(note)});
         }

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-11-02 20:26:37 +0000
+++ src/app/qml/ui/EditNoteView.qml	2016-04-29 08:41:12 +0000
@@ -111,7 +111,6 @@
     Connections {
         target: Qt.application
         onActiveChanged: {
-            print("active changed", root, root.note, active)
             if (root.note) {
                 print("Saving note:", root.note.guid)
                 root.saveNote()