Merge lp:~osomon/webbrowser-app/empty-contextual-menu into lp:webbrowser-app

[Olivier Tilloy]

Do not display an empty contextual menu.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/859/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/630
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/769
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/769/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1305
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1305/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6796/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8114

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml'
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml	2014-03-17 10:16:11 +0000
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView01.qml	2014-06-05 11:51:21 +0000
@@ -115,9 +115,15 @@
                         contextualData.href = data.href
                         contextualData.title = data.title
                     }
-                    contextualRectangle.position(data)
-                    PopupUtils.open(contextualPopover, contextualRectangle)
-                    return
+                    if (contextualActions != null) {
+                        for (var i = 0; i < contextualActions.actions.length; ++i) {
+                            if (contextualActions.actions[i].enabled) {
+                                contextualRectangle.position(data)
+                                PopupUtils.open(contextualPopover, contextualRectangle)
+                                return
+                            }
+                        }
+                    }
                 }
             }
             if ((data.event === 'longpress') || (data.event === 'selectionadjusted')) {

=== modified file 'src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml'
--- src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-05-05 20:47:07 +0000
+++ src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml	2014-06-05 11:51:21 +0000
@@ -76,8 +76,15 @@
                         contextualData.href = msg.args.href
                         contextualData.title = msg.args.title
                     }
-                    contextualRectangle.position(msg.args)
-                    internal.currentContextualMenu = PopupUtils.open(contextualPopover, contextualRectangle)
+                    if (contextualActions != null) {
+                        for (var i = 0; i < contextualActions.actions.length; ++i) {
+                            if (contextualActions.actions[i].enabled) {
+                                contextualRectangle.position(msg.args)
+                                internal.currentContextualMenu = PopupUtils.open(contextualPopover, contextualRectangle)
+                                break
+                            }
+                        }
+                    }
                 } else if (internal.currentContextualMenu != null) {
                     PopupUtils.close(internal.currentContextualMenu)
                 }