1
=== modified file 'modules/Ubuntu/Components/MainView.qml'
2
--- modules/Ubuntu/Components/MainView.qml	2013-08-22 17:15:35 +0000
3
+++ modules/Ubuntu/Components/MainView.qml	2013-09-23 08:52:24 +0000
4
@@ -247,7 +247,12 @@
5
247
            clip: headerItem.bottomY > 0 && activePage && activePage.flickable
247
            clip: headerItem.bottomY > 0 && activePage && activePage.flickable
6
248
                  && -activePage.flickable.contentY < headerItem.bottomY
248
                  && -activePage.flickable.contentY < headerItem.bottomY
7
249
249
9
250
            property Page activePage: mainView.activeLeafNode
250
            property Page activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
10
251
11
252
            function isPage(item) {
12
253
                return item.hasOwnProperty("__isPageTreeNode") && item.__isPageTreeNode &&
13
254
                        item.hasOwnProperty("title") && item.hasOwnProperty("tools");
14
255
            }
15
251
256
16
252
            Item {
257
            Item {
17
253
                id: contents
258
                id: contents
18
254
259
19
=== modified file 'modules/Ubuntu/Components/Page.qml'
20
--- modules/Ubuntu/Components/Page.qml	2013-08-22 17:08:11 +0000
21
+++ modules/Ubuntu/Components/Page.qml	2013-09-23 08:52:24 +0000
22
@@ -151,8 +151,14 @@
23
151
        UnityActions.ActionContext {
151
        UnityActions.ActionContext {
24
152
            id: actionContext
152
            id: actionContext
25
153
153
28
154
            Component.onCompleted: {
154
            property var actionManager: page.__propagated &&
29
155
                var manager = page.__propagated.actionManager;
155
                                        page.__propagated.hasOwnProperty("actionManager") ?
30
156
                                            page.__propagated.actionManager : null
31
157
32
158
            onActionManagerChanged: addLocalContext(actionManager)
33
159
            Component.onCompleted: addLocalContext(actionManager)
34
160
35
161
            function addLocalContext(manager) {
36
156
                if (manager) manager.addLocalContext(actionContext);
162
                if (manager) manager.addLocalContext(actionContext);
37
157
            }
163
            }
38
158
        }
164
        }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-09-23
Tim Peeters			Approve on 2013-09-16
Zsombor Egri		2013-09-10	Approve on 2013-09-12
Review via email: mp+184788@code.launchpad.net