1
=== modified file 'src/Ubuntu/Web/UbuntuWebView02.qml'
2
--- src/Ubuntu/Web/UbuntuWebView02.qml	2015-02-16 11:51:20 +0000
3
+++ src/Ubuntu/Web/UbuntuWebView02.qml	2015-03-18 10:51:44 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright 2013-2014 Canonical Ltd.
2
 * Copyright 2013-2015 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This file is part of webbrowser-app.
4
 * This file is part of webbrowser-app.
10
5
 *
5
 *
11
@@ -257,6 +257,8 @@
12
257
        if (loadEvent.url.toString() !== "data:text/html,chromewebdata") {
257
        if (loadEvent.url.toString() !== "data:text/html,chromewebdata") {
13
258
            internal.lastLoadRequestStatus = loadEvent.type
258
            internal.lastLoadRequestStatus = loadEvent.type
14
259
        }
259
        }
15
260
        internal.dismissCurrentContextualMenu()
16
261
        internal.dismissCurrentSelection()
17
260
    }
262
    }
18
261
263
19
262
    readonly property int screenOrientation: Screen.orientation
264
    readonly property int screenOrientation: Screen.orientation
20
263
265
21
=== modified file 'tests/autopilot/webbrowser_app/tests/test_selection.py'
22
--- tests/autopilot/webbrowser_app/tests/test_selection.py	2014-12-13 02:46:27 +0000
23
+++ tests/autopilot/webbrowser_app/tests/test_selection.py	2015-03-18 10:51:44 +0000
24
@@ -1,6 +1,6 @@
25
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
26
2
#
2
#
28
3
# Copyright 2014 Canonical
3
# Copyright 2014-2015 Canonical
29
4
#
4
#
30
5
# This program is free software: you can redistribute it and/or modify it
5
# This program is free software: you can redistribute it and/or modify it
31
6
# under the terms of the GNU General Public License version 3, as published
6
# under the terms of the GNU General Public License version 3, as published
32
@@ -89,3 +89,7 @@
33
89
        self.assertThat(self.rectangle.globalRect, Eventually(Equals(rect)))
89
        self.assertThat(self.rectangle.globalRect, Eventually(Equals(rect)))
34
90
        self.actions.wait_until_destroyed()
90
        self.actions.wait_until_destroyed()
35
91
        self.actions = self.main_window.get_selection_actions()
91
        self.actions = self.main_window.get_selection_actions()
36
92
37
93
    def test_navigating_discards_selection(self):
38
94
        self.main_window.go_back()
39
95
        self.assert_selection_eventually_dismissed()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-03-23
Ubuntu Phablet Team		2015-03-18	Pending
Review via email: mp+253332@code.launchpad.net