Michael Zanetti has proposed merging lp:~mzanetti/reminders-app/fix-edit-button into lp:reminders-app.
Commit message: fix the edit button Requested reviews: Ubuntu Notes app developers (notes-app-dev) For more details, see: https://code.launchpad.net/~mzanetti/reminders-app/fix-edit-button/+merge/293363 -- Your team Ubuntu Notes app developers is requested to review the proposed merge of lp:~mzanetti/reminders-app/fix-edit-button into lp:reminders-app.
=== 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:31:45 +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:31:45 +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()
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp