webbrowser-app

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

  1. addressbar-url-update
  2. Merge into trunk
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)
lp:~osomon/webbrowser-app/addressbar-url-update updated
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 :

FAILED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/782/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/284
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/284/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/284
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5306
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4743
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4743/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6485
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6489

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

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

PASSED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/798/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/5222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/300
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/300/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4489
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5448
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4887
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4887/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6529
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6728

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/PanelLoader.qml'
2--- src/app/PanelLoader.qml 2014-03-13 09:54:59 +0000
3+++ src/app/PanelLoader.qml 2014-04-25 16:47:57 +0000
4@@ -71,9 +71,29 @@
5 }
6
7 Chrome {
8+ id: chrome
9+
10 anchors.fill: parent
11
12- url: currentWebview ? currentWebview.url : ""
13+ Connections {
14+ target: chromePanel
15+ onCurrentWebviewChanged: {
16+ if (currentWebview !== undefined) {
17+ chrome.url = currentWebview.url
18+ }
19+ }
20+ }
21+ Connections {
22+ target: chromePanel.currentWebview
23+ onUrlChanged: {
24+ // ensure that the URL actually changes so that the
25+ // address bar is updated in case the user has entered a
26+ // new address that redirects to where she previously was
27+ // (https://bugs.launchpad.net/webbrowser-app/+bug/1306615)
28+ chrome.url = ""
29+ chrome.url = currentWebview.url
30+ }
31+ }
32
33 loading: currentWebview ? currentWebview.loading
34 // workaround for https://bugs.launchpad.net/oxide/+bug/1290821

Subscribers

People subscribed via source and target branches

to status/vote changes: