Merge lp:~osomon/webbrowser-app/workaround-popover-esc into lp:webbrowser-app

[Olivier Tilloy]

Work around bug #1546677 (UITK), by destroying the bookmark options popover instead of hiding it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1356
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2623/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1376
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1376
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4993
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27722

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/2623/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/webbrowser/BookmarkOptions.qml'
--- src/app/webbrowser/BookmarkOptions.qml	2015-08-10 15:22:00 +0000
+++ src/app/webbrowser/BookmarkOptions.qml	2016-02-17 18:29:28 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -100,7 +100,7 @@
                 anchors.right: parent.right
                 text: i18n.tr("OK")
                 color: UbuntuColors.green
-                onClicked: hide()
+                onClicked: bookmarkOptions.destroy()
             }
         }
     }

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-02-15 13:33:11 +0000
+++ src/app/webbrowser/Browser.qml	2016-02-17 18:29:28 +0000
@@ -1393,6 +1393,7 @@
     Component {
         id: bookmarkOptionsComponent
         BookmarkOptions {
+            id: bookmarkOptions
             folderModel: BookmarksFolderListModel {
                 sourceModel: BookmarksModel
             }
@@ -1401,6 +1402,18 @@
                 forceActiveFocus()
             }
 
+            // Fragile workaround for https://launchpad.net/bugs/1546677.
+            // By destroying the popover, its visibility isn’t changed to
+            // false, and thus the bookmark is not removed.
+            function closeAndConfirm() {
+                destroy()
+            }
+            onVisibleChanged: {
+                if (!visible) {
+                    BookmarksModel.remove(bookmarkUrl)
+                }
+            }
+
             Component.onDestruction: {
                 if (BookmarksModel.contains(bookmarkUrl)) {
                     BookmarksModel.update(bookmarkUrl, bookmarkTitle, bookmarkFolder)
@@ -1417,15 +1430,7 @@
                 id: bookmarkOptionsShortcuts
                 KeyboardShortcut {
                     key: Qt.Key_Return
-                    onTriggered: hide()
-                }
-
-                KeyboardShortcut {
-                    key: Qt.Key_Escape
-                    onTriggered: {
-                        BookmarksModel.remove(bookmarkUrl)
-                        hide()
-                    }
+                    onTriggered: closeAndConfirm()
                 }
 
                 KeyboardShortcut {
@@ -1433,7 +1438,7 @@
                     key: Qt.Key_D
                     onTriggered: {
                         BookmarksModel.remove(bookmarkUrl)
-                        hide()
+                        closeAndConfirm()
                     }
                 }
             }