1
=== modified file 'src/app/webbrowser/webbrowser-app.qml'
2
--- src/app/webbrowser/webbrowser-app.qml	2014-08-21 11:28:44 +0000
3
+++ src/app/webbrowser/webbrowser-app.qml	2014-10-06 10:37:06 +0000
4
@@ -51,9 +51,7 @@
5
51
        Component.onCompleted: i18n.domain = "webbrowser-app"
51
        Component.onCompleted: i18n.domain = "webbrowser-app"
6
52
    }
52
    }
7
53
53
11
54
    // XXX: work around https://bugs.launchpad.net/unity8/+bug/1328839
54
    visibility: browser.currentWebview && browser.currentWebview.fullscreen ? Window.FullScreen : Window.AutomaticVisibility
9
55
    // by toggling fullscreen on the window only on desktop.
10
56
    visibility: browser.currentWebview && browser.currentWebview.fullscreen && (formFactor === "desktop") ? Window.FullScreen : Window.AutomaticVisibility
12
57
55
13
58
    // Handle runtime requests to open urls as defined
56
    // Handle runtime requests to open urls as defined
14
59
    // by the freedesktop application dbus interface's open
57
    // by the freedesktop application dbus interface's open
15
60
58
16
=== modified file 'src/app/webcontainer/webapp-container.qml'
17
--- src/app/webcontainer/webapp-container.qml	2014-10-03 14:41:14 +0000
18
+++ src/app/webcontainer/webapp-container.qml	2014-10-06 10:37:06 +0000
19
@@ -115,10 +115,7 @@
20
115
        }
115
        }
21
116
    }
116
    }
22
117
117
27
118
    // XXX: work around https://bugs.launchpad.net/unity8/+bug/1328839
118
    visibility: browser.currentWebview && browser.currentWebview.fullscreen ? Window.FullScreen : Window.AutomaticVisibility
24
119
    // by toggling fullscreen on the window only on desktop.
25
120
    visibility: browser.currentWebview && browser.currentWebview.fullscreen &&
26
121
                (formFactor === "desktop") ? Window.FullScreen : Window.AutomaticVisibility
28
122
119
29
123
    Loader {
120
    Loader {
30
124
        id: accountsPageComponentLoader
121
        id: accountsPageComponentLoader
31
125
122
32
=== modified file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
33
--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-06-18 16:20:49 +0000
34
+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-10-06 10:37:06 +0000
35
@@ -18,7 +18,6 @@
36
18
18
37
19
from testtools.matchers import Equals, LessThan
19
from testtools.matchers import Equals, LessThan
38
20
from autopilot.matchers import Eventually
20
from autopilot.matchers import Eventually
39
21
from autopilot.platform import model
40
22
21
41
23
22
42
24
class TestFullscreen(StartOpenRemotePageTestCaseBase):
23
class TestFullscreen(StartOpenRemotePageTestCaseBase):
43
@@ -35,11 +34,6 @@
44
35
    def assert_eventually_fullscreen(self):
34
    def assert_eventually_fullscreen(self):
45
36
        self.assertThat(self.main_window.get_current_webview().fullscreen,
35
        self.assertThat(self.main_window.get_current_webview().fullscreen,
46
37
                        Eventually(Equals(True)))
36
                        Eventually(Equals(True)))
47
38
        if model() != 'Desktop':
48
39
            # XXX: do not assert that the window is fullscreen
49
40
            # on devices due to the temporary workaround for
50
41
            # https://bugs.launchpad.net/unity8/+bug/1328839
51
42
            return
52
43
        self.assertThat(self.main_window.get_window().visibility,
37
        self.assertThat(self.main_window.get_window().visibility,
53
44
                        Eventually(Equals(self.QWINDOW_FULLSCREEN)))
38
                        Eventually(Equals(self.QWINDOW_FULLSCREEN)))
54
45
39
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-10-06
Ubuntu Phablet Team		2014-10-06	Pending
Review via email: mp+237234@code.launchpad.net