Merge lp:~osomon/webbrowser-app/addressbar-url-update into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 517
Proposed branch: lp:~osomon/webbrowser-app/addressbar-url-update
Merge into: lp:webbrowser-app
Diff against target: 34 lines (+21/-1)
1 file modified
src/app/PanelLoader.qml (+21/-1)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/addressbar-url-update
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+217245@code.launchpad.net

Commit message

Ensure that the URL actually changes so that the address bar is updated in case the user has entered a new address that redirects to where she previously was.

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

FAILED: Continuous integration, rev:504
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/775/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5069
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4246/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/277
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/277/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/277
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4359
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5258
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5258/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4695
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4695/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6470/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6414

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

review: Needs Fixing (continuous-integration)
505. By Olivier Tilloy

Update the address bar when changing tabs.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/779/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5075
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4250/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/281
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/281/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/281
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5264
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4702
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4702/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6474/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6421

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/app/PanelLoader.qml'
--- src/app/PanelLoader.qml 2014-03-13 09:54:59 +0000
+++ src/app/PanelLoader.qml 2014-04-25 16:47:57 +0000
@@ -71,9 +71,29 @@
71 }71 }
7272
73 Chrome {73 Chrome {
74 id: chrome
75
74 anchors.fill: parent76 anchors.fill: parent
7577
76 url: currentWebview ? currentWebview.url : ""78 Connections {
79 target: chromePanel
80 onCurrentWebviewChanged: {
81 if (currentWebview !== undefined) {
82 chrome.url = currentWebview.url
83 }
84 }
85 }
86 Connections {
87 target: chromePanel.currentWebview
88 onUrlChanged: {
89 // ensure that the URL actually changes so that the
90 // address bar is updated in case the user has entered a
91 // new address that redirects to where she previously was
92 // (https://bugs.launchpad.net/webbrowser-app/+bug/1306615)
93 chrome.url = ""
94 chrome.url = currentWebview.url
95 }
96 }
7797
78 loading: currentWebview ? currentWebview.loading98 loading: currentWebview ? currentWebview.loading
79 // workaround for https://bugs.launchpad.net/oxide/+bug/129082199 // workaround for https://bugs.launchpad.net/oxide/+bug/1290821

Subscribers

People subscribed via source and target branches

to status/vote changes: