webbrowser-app

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

  1. fix-uri-handler
  2. Merge into trunk
Proposed by Alexandre Abreu
Status: Merged
Approved by: Olivier Tilloy
Approved revision: no longer in the source branch.
Merged at revision: 661
Proposed branch: lp:~abreu-alexandre/webbrowser-app/fix-uri-handler
Merge into: lp:webbrowser-app
Diff against target: 16 lines (+4/-2)
1 file modified
src/app/webcontainer/webapp-container.qml (+4/-2)
To merge this branch: bzr merge lp:~abreu-alexandre/webbrowser-app/fix-uri-handler
Reviewer Review Type Date Requested Status
Olivier Tilloy Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+229993@code.launchpad.net

Commit message

Fix URI handling by the webapp container.

Description of the change

Fix Uri Handling

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
658. By Launchpad Translations on behalf of phablet-team

Launchpad automatic translations update.

Revision history for this message
Olivier Tilloy (osomon) wrote :

LGTM.

review: Approve
lp:~abreu-alexandre/webbrowser-app/fix-uri-handler updated
659. By Launchpad Translations on behalf of phablet-team

Launchpad automatic translations update.

660. By Alexandre Abreu

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

661. By Alexandre Abreu

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/webcontainer/webapp-container.qml'
2--- src/app/webcontainer/webapp-container.qml 2014-08-05 10:53:57 +0000
3+++ src/app/webcontainer/webapp-container.qml 2014-08-07 19:17:30 +0000
4@@ -179,8 +179,10 @@
5 target: UriHandler
6 onOpened: {
7 // only consider the first one (if multiple)
8- if (uris.length !== 0) {
9- url = uris[0];
10+ if (uris.length !== 0
11+ && webappPageComponentLoader.item
12+ && webappPageComponentLoader.item.currentWebview) {
13+ webappPageComponentLoader.item.currentWebview.url = uris[0];
14 }
15 }
16 }

Subscribers

People subscribed via source and target branches

to status/vote changes: