webbrowser-app

Merge lp:~osomon/webbrowser-app/about-blank into lp:webbrowser-app

  1. about-blank
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 967
Merged at revision: 979
Proposed branch: lp:~osomon/webbrowser-app/about-blank
Merge into: lp:webbrowser-app
Diff against target: 70 lines (+12/-2)
4 files modified
src/app/webbrowser/AddressBar.qml (+3/-0)
src/app/webbrowser/SettingsPage.qml (+1/-1)
src/app/webbrowser/urlManagement.js (+6/-1)
tests/unittests/qml/tst_AddressBar.qml (+2/-0)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/about-blank
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+256224@code.launchpad.net

Commit message

Recognize about:blank as a valid URL.

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

FAILED: Continuous integration, rev:967
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1637/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2228/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/395
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/395/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/395
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1954/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2226
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2226/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19621

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

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

FAILED: Continuous integration, rev:967
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1639/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/397
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/397
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/397
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1960
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2231
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19634

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

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

FAILED: Continuous integration, rev:967
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1640/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/398
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/398
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1961
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2232
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19636

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

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

PASSED: Continuous integration, rev:967
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1672/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/429
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/429/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/429
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2321
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19768

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/1672/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/webbrowser/AddressBar.qml'
2--- src/app/webbrowser/AddressBar.qml 2015-04-07 17:10:56 +0000
3+++ src/app/webbrowser/AddressBar.qml 2015-04-14 21:14:11 +0000
4@@ -257,6 +257,9 @@
5
6 function simplifyUrl(url) {
7 var urlString = url.toString()
8+ if (urlString == "about:blank") {
9+ return url
10+ }
11 var hasProtocol = urlString.indexOf("://") != -1
12 var domain
13 if (hasProtocol) {
14
15=== modified file 'src/app/webbrowser/SettingsPage.qml'
16--- src/app/webbrowser/SettingsPage.qml 2015-04-08 14:09:30 +0000
17+++ src/app/webbrowser/SettingsPage.qml 2015-04-14 21:14:11 +0000
18@@ -293,7 +293,7 @@
19 objectName: "homepageDialog.saveButton"
20 anchors { left: parent.left; right: parent.right }
21 text: i18n.tr("Save")
22- enabled: UrlManagement.looksLikeAUrl(homepageTextField.text)
23+ enabled: UrlManagement.looksLikeAUrl(homepageTextField.text.trim())
24 color: "#3fb24f"
25 onClicked: {
26 settingsObject.homepage = UrlManagement.fixUrl(homepageTextField.text);
27
28=== modified file 'src/app/webbrowser/urlManagement.js'
29--- src/app/webbrowser/urlManagement.js 2015-04-07 17:10:56 +0000
30+++ src/app/webbrowser/urlManagement.js 2015-04-14 21:14:11 +0000
31@@ -19,7 +19,9 @@
32
33 function fixUrl(address) {
34 var url = address
35- if (address.substr(0, 1) == "/") {
36+ if (address.toLowerCase() == "about:blank") {
37+ return address.toLowerCase()
38+ } else if (address.substr(0, 1) == "/") {
39 url = "file://" + address
40 } else if (address.indexOf("://") == -1) {
41 url = "http://" + address
42@@ -32,6 +34,9 @@
43 if (terms.length > 1) {
44 return false
45 }
46+ if (address.toLowerCase() == "about:blank") {
47+ return true
48+ }
49 if (address.substr(0, 1) == "/") {
50 return true
51 }
52
53=== modified file 'tests/unittests/qml/tst_AddressBar.qml'
54--- tests/unittests/qml/tst_AddressBar.qml 2015-03-25 14:12:12 +0000
55+++ tests/unittests/qml/tst_AddressBar.qml 2015-04-14 21:14:11 +0000
56@@ -90,6 +90,7 @@
57 {url: "http://ubuntu.com"},
58 {url: "https://google.com"},
59 {url: "ftp://ubuntu.com"},
60+ {url: "about:blank"},
61 ]
62 }
63
64@@ -192,6 +193,7 @@
65 {text: "HTTPS://www.ubuntu.com", requestedUrl: "https://www.ubuntu.com"},
66 {text: "FILE:///usr/share/doc/ubuntu-online-tour/index.html", requestedUrl: "file:///usr/share/doc/ubuntu-online-tour/index.html"},
67 {text: "FTP://ubuntu.com", requestedUrl: "ftp://ubuntu.com"},
68+ {text: "ABOUT:BLANK", requestedUrl: "about:blank"},
69 ]
70 }
71

Subscribers

People subscribed via source and target branches

to status/vote changes: