1
=== modified file 'src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp'
2
--- src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp	2016-07-07 08:42:42 +0000
3
+++ src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp	2016-07-19 18:13:13 +0000
4
@@ -382,7 +382,7 @@
5
382
    d->url = url;
382
    d->url = url;
6
383
    Q_EMIT contentChanged(d->url);
383
    Q_EMIT contentChanged(d->url);
7
384
    // invoke loader if the preload is set
384
    // invoke loader if the preload is set
9
385
    if (d->bottomEdge && (d->bottomEdge->preloadContent()) && !d->url.isValid()) {
385
    if (d->bottomEdge && (d->bottomEdge->preloadContent()) && d->url.isValid()) {
10
386
        d->loadContent(UCBottomEdgeRegionPrivate::LoadingUrl);
386
        d->loadContent(UCBottomEdgeRegionPrivate::LoadingUrl);
11
387
    }
387
    }
12
388
}
388
}
13
389
389
14
=== added file 'tests/unit/bottomedge/ExternalContent.qml'
15
--- tests/unit/bottomedge/ExternalContent.qml	1970-01-01 00:00:00 +0000
16
+++ tests/unit/bottomedge/ExternalContent.qml	2016-07-19 18:13:13 +0000
17
@@ -0,0 +1,27 @@
18
1
/*
19
2
 * Copyright 2016 Canonical Ltd.
20
3
 *
21
4
 * This program is free software; you can redistribute it and/or modify
22
5
 * it under the terms of the GNU Lesser General Public License as published by
23
6
 * the Free Software Foundation; version 3.
24
7
 *
25
8
 * This program is distributed in the hope that it will be useful,
26
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
27
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
28
11
 * GNU Lesser General Public License for more details.
29
12
 *
30
13
 * You should have received a copy of the GNU Lesser General Public License
31
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
32
15
 *
33
16
 */
34
17
35
18
import QtQuick 2.4
36
19
import Ubuntu.Components 1.3
37
20
38
21
Rectangle {
39
22
    objectName: "external"
40
23
    width: parent ? parent.width : 0
41
24
    height: parent ? parent.height : 0
42
25
    color: UbuntuColors.silk
43
26
}
44
27
45
0
28
46
=== added file 'tests/unit/bottomedge/PreloadContentUrl.qml'
47
--- tests/unit/bottomedge/PreloadContentUrl.qml	1970-01-01 00:00:00 +0000
48
+++ tests/unit/bottomedge/PreloadContentUrl.qml	2016-07-19 18:13:13 +0000
49
@@ -0,0 +1,35 @@
50
1
/*
51
2
 * Copyright 2016 Canonical Ltd.
52
3
 *
53
4
 * This program is free software; you can redistribute it and/or modify
54
5
 * it under the terms of the GNU Lesser General Public License as published by
55
6
 * the Free Software Foundation; version 3.
56
7
 *
57
8
 * This program is distributed in the hope that it will be useful,
58
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
59
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
60
11
 * GNU Lesser General Public License for more details.
61
12
 *
62
13
 * You should have received a copy of the GNU Lesser General Public License
63
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
64
15
 *
65
16
 */
66
17
67
18
import QtQuick 2.4
68
19
import Ubuntu.Components 1.3
69
20
70
21
Item {
71
22
    id: holder
72
23
    width: units.gu(40)
73
24
    height: units.gu(71)
74
25
75
26
    BottomEdge {
76
27
        id: bottomEdge
77
28
        height: parent.height
78
29
        hint.text: "Test"
79
30
        objectName: "testItem"
80
31
        preloadContent: true
81
32
        contentUrl: Qt.resolvedUrl("ExternalContent.qml")
82
33
    }
83
34
}
84
35
85
0
36
86
=== modified file 'tests/unit/bottomedge/bottomedge.pro'
87
--- tests/unit/bottomedge/bottomedge.pro	2016-05-31 09:02:35 +0000
88
+++ tests/unit/bottomedge/bottomedge.pro	2016-07-19 18:13:13 +0000
89
@@ -24,4 +24,6 @@
90
24
    UncoveredByRegion.qml \
24
    UncoveredByRegion.qml \
91
25
    OverriddenHintTrigger.qml \
25
    OverriddenHintTrigger.qml \
92
26
    PreloadedContent.qml \
26
    PreloadedContent.qml \
94
27
    BottomEdgeWithAction.qml
27
    BottomEdgeWithAction.qml \
95
28
    PreloadContentUrl.qml \
96
29
    ExternalContent.qml
97
28
30
98
=== modified file 'tests/unit/bottomedge/tst_bottomedge.cpp'
99
--- tests/unit/bottomedge/tst_bottomedge.cpp	2016-07-07 15:33:34 +0000
100
+++ tests/unit/bottomedge/tst_bottomedge.cpp	2016-07-19 18:13:13 +0000
101
@@ -941,6 +941,16 @@
102
941
        QCOMPARE(regionObjects[i++], QString("default"));
941
        QCOMPARE(regionObjects[i++], QString("default"));
103
942
    }
942
    }
104
943
943
105
944
    void test_preload_content_url()
106
945
    {
107
946
        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("PreloadContentUrl.qml"));
108
947
        UCBottomEdge *bottomEdge = test->testItem();
109
948
110
949
        // commit so the contentItem is set
111
950
        bottomEdge->commit();
112
951
        QTRY_VERIFY(bottomEdge->contentItem());
113
952
    }
114
953
115
944
    void test_reset_preload_content()
954
    void test_reset_preload_content()
116
945
    {
955
    {
117
946
        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("PreloadedContent.qml"));
956
        QScopedPointer<BottomEdgeTestCase> test(new BottomEdgeTestCase("PreloadedContent.qml"));
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-07-19
Tim Peeters		2016-07-19	Approve on 2016-07-19
Andrew Hayzen (community)	functional		Approve on 2016-07-19
Review via email: mp+300509@code.launchpad.net