1
=== modified file 'src/app/webbrowser/AddressBar.qml'
2
--- src/app/webbrowser/AddressBar.qml	2015-01-23 10:30:19 +0000
3
+++ src/app/webbrowser/AddressBar.qml	2015-03-25 14:13:18 +0000
4
@@ -243,9 +243,9 @@
5
243
            if (address.substr(0, 1) == "/") {
243
            if (address.substr(0, 1) == "/") {
6
244
                return true
244
                return true
7
245
            }
245
            }
11
246
            if (address.match(/^https?:\/\//) ||
246
            if (address.match(/^https?:\/\//i) ||
12
247
                address.match(/^file:\/\//) ||
247
                address.match(/^file:\/\//i) ||
13
248
                address.match(/^[a-z]+:\/\//)) {
248
                address.match(/^[a-z]+:\/\//i)) {
14
249
                return true
249
                return true
15
250
            }
250
            }
16
251
            if (address.split('/', 1)[0].match(/\.[a-zA-Z]{2,4}$/)) {
251
            if (address.split('/', 1)[0].match(/\.[a-zA-Z]{2,4}$/)) {
17
252
252
18
=== modified file 'tests/unittests/qml/tst_AddressBar.qml'
19
--- tests/unittests/qml/tst_AddressBar.qml	2015-01-23 10:34:50 +0000
20
+++ tests/unittests/qml/tst_AddressBar.qml	2015-03-25 14:13:18 +0000
21
@@ -185,6 +185,24 @@
22
185
            compare(addressBar.requestedUrl, data.requestedUrl)
185
            compare(addressBar.requestedUrl, data.requestedUrl)
23
186
        }
186
        }
24
187
187
25
188
        function test_uppercaseSchemeShouldBeRewritten_data() {
26
189
            return [
27
190
                {text: "HTTP://WWW.UBUNTU.COM", requestedUrl: "http://www.ubuntu.com"},
28
191
                {text: "HTTP://www.ubuntu.com", requestedUrl: "http://www.ubuntu.com"},
29
192
                {text: "HTTPS://www.ubuntu.com", requestedUrl: "https://www.ubuntu.com"},
30
193
                {text: "FILE:///usr/share/doc/ubuntu-online-tour/index.html", requestedUrl: "file:///usr/share/doc/ubuntu-online-tour/index.html"},
31
194
                {text: "FTP://ubuntu.com", requestedUrl: "ftp://ubuntu.com"},
32
195
            ]
33
196
        }
34
197
35
198
        function test_uppercaseSchemeShouldBeRewritten(data) {
36
199
            typeString(data.text)
37
200
            compare(addressBar.text, data.text)
38
201
            keyClick(Qt.Key_Return)
39
202
            validatedSpy.wait()
40
203
            compare(addressBar.requestedUrl, data.requestedUrl)
41
204
        }
42
205
43
188
        function test_urlShouldBeSimplifiedWhenUnfocused_data() {
206
        function test_urlShouldBeSimplifiedWhenUnfocused_data() {
44
189
            return [
207
            return [
45
190
                {input: "http://www.ubuntu.com",
208
                {input: "http://www.ubuntu.com",
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-03-25
Ubuntu Phablet Team		2015-03-25	Pending
Review via email: mp+254093@code.launchpad.net