1
=== modified file 'src/app/webbrowser/AddressBar.qml'
2
--- src/app/webbrowser/AddressBar.qml	2014-07-30 07:55:55 +0000
3
+++ src/app/webbrowser/AddressBar.qml	2014-08-13 22:06:27 +0000
4
@@ -172,7 +172,7 @@
5
172
        }
172
        }
6
173
        onActiveFocusChanged: {
173
        onActiveFocusChanged: {
7
174
            if (!activeFocus) {
174
            if (!activeFocus) {
9
175
                if (addressbar.actualUrl.toString()) {
175
                if (!addressbar.loading && addressbar.actualUrl.toString()) {
10
176
                    text = addressbar.actualUrl
176
                    text = addressbar.actualUrl
11
177
                }
177
                }
12
178
            }
178
            }
13
179
179
14
=== modified file 'src/app/webbrowser/Chrome.qml'
15
--- src/app/webbrowser/Chrome.qml	2014-07-30 10:37:20 +0000
16
+++ src/app/webbrowser/Chrome.qml	2014-08-13 22:06:27 +0000
17
@@ -98,11 +98,13 @@
18
98
                     // Workaround for https://bugs.launchpad.net/oxide/+bug/1290821.
98
                     // Workaround for https://bugs.launchpad.net/oxide/+bug/1290821.
19
99
                     && !chrome.webview.lastLoadStopped
99
                     && !chrome.webview.lastLoadStopped
20
100
                     : false
100
                     : false
21
101
            onLoadingChanged: {
22
102
                if (loading) {
23
103
                    chrome.webview.forceActiveFocus()
24
104
                }
25
105
            }
26
101
106
31
102
            onValidated: {
107
            onValidated: chrome.webview.url = requestedUrl
28
103
                chrome.webview.url = requestedUrl
29
104
                chrome.webview.forceActiveFocus()
30
105
            }
32
106
            onRequestReload: chrome.webview.reload()
108
            onRequestReload: chrome.webview.reload()
33
107
            onRequestStop: chrome.webview.stop()
109
            onRequestStop: chrome.webview.stop()
34
108
110
35
109
111
36
=== modified file 'tests/autopilot/webbrowser_app/tests/test_addressbar_states.py'
37
--- tests/autopilot/webbrowser_app/tests/test_addressbar_states.py	2014-07-16 10:47:40 +0000
38
+++ tests/autopilot/webbrowser_app/tests/test_addressbar_states.py	2014-08-13 22:06:27 +0000
39
@@ -57,3 +57,23 @@
40
57
        webview = self.main_window.get_current_webview()
57
        webview = self.main_window.get_current_webview()
41
58
        self.pointing_device.click_object(webview)
58
        self.pointing_device.click_object(webview)
42
59
        self.assertThat(address_bar.text, Eventually(Equals(self.url)))
59
        self.assertThat(address_bar.text, Eventually(Equals(self.url)))
43
60
44
61
    def test_looses_focus_when_loading_starts(self):
45
62
        address_bar = self.main_window.get_chrome().get_address_bar()
46
63
        self.pointing_device.click_object(address_bar)
47
64
        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
48
65
        self.assertThat(address_bar.state, Eventually(Equals("editing")))
49
66
        url = self.base_url + "/aleaiactaest"
50
67
        self.go_to_url(url)
51
68
        self.assertThat(address_bar.state, Eventually(Equals("")))
52
69
        self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
53
70
54
71
    def test_looses_focus_when_reloading(self):
55
72
        address_bar = self.main_window.get_chrome().get_address_bar()
56
73
        self.pointing_device.click_object(address_bar)
57
74
        self.assertThat(address_bar.activeFocus, Eventually(Equals(True)))
58
75
        self.assertThat(address_bar.state, Eventually(Equals("editing")))
59
76
        action_button = address_bar.get_action_button()
60
77
        self.pointing_device.click_object(action_button)
61
78
        self.assertThat(address_bar.state, Eventually(Equals("")))
62
79
        self.assertThat(address_bar.activeFocus, Eventually(Equals(False)))
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-08-18
Ubuntu Phablet Team		2014-08-13	Pending
Review via email: mp+230724@code.launchpad.net