Merge lp:~abreu-alexandre/webbrowser-app/fix-uri-handler into lp:webbrowser-app

[Alexandre Abreu]

Fix URI handling by the webapp container.

Fix Uri Handling

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:658
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1011/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-amd64-ci/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/210
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-armhf-ci/210/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-utopic-i386-ci/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4453
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4453/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2793
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2793/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~abreu-alexandre/webbrowser-app/fix-uri-handler]

658. By Launchpad Translations on behalf of phablet-team on 2014-08-08

Launchpad automatic translations update.

[Olivier Tilloy (osomon)]

LGTM.

review: Approve

[lp:~abreu-alexandre/webbrowser-app/fix-uri-handler]

659. By Launchpad Translations on behalf of phablet-team on 2014-08-10

Launchpad automatic translations update.

660. By Alexandre Abreu on 2014-08-11

Add devtools support & ubuntu webview remote debugging
Approved by: PS Jenkins bot, Olivier Tilloy

661. By Alexandre Abreu on 2014-08-11

Fix URI handling by the webapp container. Fixes: 1342129
Approved by: PS Jenkins bot, Olivier Tilloy

=== modified file 'src/app/webcontainer/webapp-container.qml'
--- src/app/webcontainer/webapp-container.qml	2014-08-05 10:53:57 +0000
+++ src/app/webcontainer/webapp-container.qml	2014-08-07 19:17:30 +0000
@@ -179,8 +179,10 @@
         target: UriHandler
         onOpened: {
             // only consider the first one (if multiple)
-            if (uris.length !== 0) {
-                url = uris[0];
+            if (uris.length !== 0
+                    && webappPageComponentLoader.item
+                    && webappPageComponentLoader.item.currentWebview) {
+                webappPageComponentLoader.item.currentWebview.url = uris[0];
             }
         }
     }