Merge lp:~abreu-alexandre/webbrowser-app/fix-url-opening into lp:webbrowser-app

[Alexandre Abreu]

Fix UriHandler url opening operation for the webapp container.

Fix UriHandler url opening operation.

Test to validate the issue:
---------------------------

- open a webapp (e.g. facebook) and stay on the main page and leave it open,
- create small qml app that would basically trigger the whole url dispatcher loop w/ a call to e.g.

Qt.openUrlExternally("https://www.facebook.com/<your-homepage>")

- launch the app, trigger the url dispatch w/ the custom url,
- the facebook webapp should pick it up and browse to the url,

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:718
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1098/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5074/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3704
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/297
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/297
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/297/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/297
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4822/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6326
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6326/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4015
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4015/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good, and fixes the bug indeed.

review: Approve

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2014-08-27 13:21:34 +0000
+++ src/app/webcontainer/webapp-container.qml	2014-09-22 21:00:28 +0000
@@ -203,9 +203,7 @@
         target: UriHandler
         onOpened: {
             // only consider the first one (if multiple)
-            if (uris.length === 0 ||
-                    !webappPageComponentLoader.item ||
-                    !webappPageComponentLoader.item.currentWebview) {
+            if (uris.length === 0 || !browser.currentWebview) {
                 return;
             }
             var requestedUrl = uris[0].toString();
@@ -214,7 +212,7 @@
                     && requestedUrl.indexOf(popupRedirectionUrlPrefix) === 0) {
                 return;
             }
-            webappPageComponentLoader.item.currentWebview.url = requestedUrl;
+            browser.currentWebview.url = requestedUrl;
         }
     }
 }