1
=== added file 'qml/Components/Autoscroller.qml'
2
--- qml/Components/Autoscroller.qml	1970-01-01 00:00:00 +0000
3
+++ qml/Components/Autoscroller.qml	2016-10-18 14:03:36 +0000
4
@@ -0,0 +1,164 @@
5
1
/*
6
2
 * Copyright (C) 2016 Canonical, Ltd.
7
3
 *
8
4
 * This program is free software; you can redistribute it and/or modify
9
5
 * it under the terms of the GNU General Public License as published by
10
6
 * the Free Software Foundation; version 3.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 */
20
16
21
17
import QtQuick 2.4
22
18
import Ubuntu.Components 1.3
23
19
24
20
Item {
25
21
    id: root
26
22
27
23
    property bool enabled: false
28
24
    property bool horizontal: false
29
25
30
26
    // Uses an animation to smooth scrolling.
31
27
    // This is useful for a large delay/step, but with smaller
32
28
    // values it creates too much lag and should be disabled.
33
29
    // The default value of 2dp/2ms ensures an update for every event loop
34
30
    // and an animation can't smooth that anyway.
35
31
    property bool smoothScrolling: false
36
32
    property bool variableVelocity: true
37
33
    property int delay: 32 // ms delay between scrolls
38
34
    property real areaLength: units.gu(5)
39
35
    property real maximumStep: units.dp(2)
40
36
    property Flickable flickable
41
37
42
38
    function startScrolling(positiveDirection) {
43
39
        progressiveScrollingTimer.scrollPositiveDirection = positiveDirection;
44
40
        progressiveScrollingTimer.start();
45
41
    }
46
42
47
43
    function stopScrolling() {
48
44
        progressiveScrollingTimer.stop();
49
45
    }
50
46
51
47
    /* If enabled, increase step size based on pointer location
52
48
     * This makes scrolling change speed depending on how close the pointer
53
49
     * is to the upper/lower limit
54
50
     */
55
51
    function stepSize() {
56
52
        if (!root.variableVelocity) return root.maximumStep;
57
53
        var step;
58
54
        if (!progressiveScrollingTimer.scrollPositiveDirection) {
59
55
            var delta;
60
56
            delta = d.relevantMouseAxis - d.lowerLimit;
61
57
            delta = delta / root.areaLength;
62
58
            step = Math.abs(delta) * root.maximumStep;
63
59
        } else {
64
60
            delta = d.relevantMouseAxis - d.upperLimit;
65
61
            delta = delta / root.areaLength;
66
62
            step = Math.abs(delta) * root.maximumStep;
67
63
        }
68
64
69
65
        return Math.ceil(step);
70
66
    }
71
67
72
68
    QtObject {
73
69
        id: d
74
70
75
71
        readonly property bool atRelevantContentAxisBeginning: root.horizontal ?
76
72
            root.flickable.atXBeginning : root.flickable.atYBeginning
77
73
78
74
        readonly property bool atRelevantContentAxisEnd: root.horizontal ?
79
75
            root.flickable.atXEnd : root.flickable.atYEnd
80
76
81
77
        // lower and upper are in terms of raw coordinates and not top/bottom of a list
82
78
        readonly property real lowerLimit: root.areaLength
83
79
        readonly property real upperLimit: {
84
80
            if (root.horizontal) {
85
81
                return (root.flickable.visibleArea.widthRatio *
86
82
                        root.flickable.contentWidth) - root.areaLength;
87
83
            } else {
88
84
                return (root.flickable.visibleArea.heightRatio *
89
85
                        root.flickable.contentHeight) - root.areaLength;
90
86
            }
91
87
        }
92
88
93
89
        property real relevantContentAxis
94
90
        property real relevantMouseAxis
95
91
96
92
        Behavior on relevantContentAxis {
97
93
            animation: UbuntuNumberAnimation{}
98
94
            enabled: root.smoothScrolling
99
95
        }
100
96
    }
101
97
102
98
    Timer {
103
99
        id: progressiveScrollingTimer
104
100
105
101
        property bool scrollPositiveDirection: true
106
102
        readonly property real listEnd: {
107
103
            if (root.horizontal) {
108
104
                return Math.floor((1 - root.flickable.visibleArea.widthRatio) *
109
105
                        root.flickable.contentWidth);
110
106
            } else {
111
107
                return Math.floor((1 - root.flickable.visibleArea.heightRatio) *
112
108
                        root.flickable.contentHeight);
113
109
            }
114
110
        }
115
111
        interval: root.delay
116
112
        repeat: true
117
113
        running: false
118
114
119
115
        onTriggered: {
120
116
            if (!scrollPositiveDirection && !d.atRelevantContentAxisBeginning) {
121
117
                if (d.relevantContentAxis > root.stepSize()) {
122
118
                    d.relevantContentAxis -= root.stepSize();
123
119
                } else {
124
120
                    d.relevantContentAxis = 0;
125
121
                    stopScrolling();
126
122
                }
127
123
            } else if (scrollPositiveDirection && !d.atRelevantContentAxisEnd) {
128
124
                if (listEnd - d.relevantContentAxis > root.stepSize()) {
129
125
                    d.relevantContentAxis += root.stepSize();
130
126
                } else {
131
127
                    d.relevantContentAxis = listEnd;
132
128
                    stopScrolling();
133
129
                }
134
130
            }
135
131
        }
136
132
    }
137
133
138
134
    Binding {
139
135
        target: root.flickable
140
136
        property: root.horizontal ? "contentX" : "contentY"
141
137
        value: d.relevantContentAxis
142
138
    }
143
139
144
140
    Mouse.onPositionChanged: {
145
141
        if (!root.enabled) return;
146
142
147
143
        // This synchronizes the bindings as scrolling from the middle of the list
148
144
        // can sometimes break
149
145
        if (root.horizontal) d.relevantContentAxis = root.flickable.contentX
150
146
        else d.relevantContentAxis = root.flickable.contentY
151
147
152
148
        d.relevantMouseAxis  = (root.horizontal ? mouse.x : mouse.y)
153
149
        if (d.relevantMouseAxis < d.lowerLimit && !d.atRelevantContentAxisBeginning) {
154
150
            startScrolling(false);
155
151
            mouse.accepted = true;
156
152
        } else if (d.relevantMouseAxis >= d.upperLimit && !d.atRelevantContentAxisEnd) {
157
153
            startScrolling(true);
158
154
            mouse.accepted = true;
159
155
        } else {
160
156
            stopScrolling();
161
157
        }
162
158
    }
163
159
164
160
    Mouse.onReleased: {
165
161
        stopScrolling();
166
162
        mouse.accepted = root.enabled
167
163
    }
168
164
}
169
0
165
170
=== modified file 'qml/Dash/Dash.qml'
171
--- qml/Dash/Dash.qml	2016-05-02 07:57:07 +0000
172
+++ qml/Dash/Dash.qml	2016-10-18 14:03:36 +0000
173
@@ -36,7 +36,7 @@
174
36
        }
36
        }
175
37
    }
37
    }
176
38
38
178
39
    property bool windowActive: window.active
39
    property bool windowActive: typeof(window) !== "undefined" ? window.active : false
179
40
    property bool showOverlayScope: false
40
    property bool showOverlayScope: false
180
41
41
181
42
    DashCommunicatorService {
42
    DashCommunicatorService {
182
43
43
183
=== modified file 'qml/Dash/DashPageHeader.qml'
184
--- qml/Dash/DashPageHeader.qml	2016-08-16 14:06:26 +0000
185
+++ qml/Dash/DashPageHeader.qml	2016-10-18 14:03:36 +0000
186
@@ -81,7 +81,7 @@
187
81
    }
81
    }
188
82
82
189
83
    function closePopup(keepFocus, keepSearch) {
83
    function closePopup(keepFocus, keepSearch) {
191
84
        if (extraPanel.visible) {
84
        if (extraPanel && extraPanel.visible) {
192
85
            extraPanel.visible = false;
85
            extraPanel.visible = false;
193
86
        }
86
        }
194
87
        if (!keepFocus) {
87
        if (!keepFocus) {
195
88
88
196
=== modified file 'qml/Dash/ScopesList.qml'
197
--- qml/Dash/ScopesList.qml	2016-07-27 16:23:18 +0000
198
+++ qml/Dash/ScopesList.qml	2016-10-18 14:03:36 +0000
199
@@ -66,6 +66,9 @@
200
66
            if (backIsClose) {
66
            if (backIsClose) {
201
67
                root.state = "browse"
67
                root.state = "browse"
202
68
            } else {
68
            } else {
203
69
                if (flickable.contentY > 0) {
204
70
                    flickable.clip = true;
205
71
                }
206
69
                root.backClicked()
72
                root.backClicked()
207
70
            }
73
            }
208
71
        }
74
        }
209
@@ -73,50 +76,113 @@
210
73
        z: 1
76
        z: 1
211
74
    }
77
    }
212
75
78
215
76
    Flickable {
79
    Autoscroller {
216
77
        objectName: "scopesListFlickable"
80
        id: autoscroller
217
81
        objectName: "scopesListAutoscroller"
218
82
219
78
        anchors {
83
        anchors {
220
79
            top: header.bottom
84
            top: header.bottom
221
80
            bottom: parent.bottom
85
            bottom: parent.bottom
222
81
            left: parent.left
86
            left: parent.left
223
82
            right: parent.right
87
            right: parent.right
224
83
        }
88
        }
248
84
        clip: true
89
249
85
        contentWidth: root.width
90
        enabled: root.state === "edit"
250
86
        contentHeight: column.height
91
        flickable: flickable
251
87
        onContentHeightChanged: returnToBounds();
92
252
88
        Column {
93
        Flickable {
253
89
            id: column
94
            id: flickable
254
90
            Repeater {
95
            objectName: "scopesListFlickable"
255
91
                model: scope ? scope.categories : null
96
256
92
97
            anchors.fill: parent
257
93
                delegate: Loader {
98
258
94
                    asynchronous: true
99
            // Reset to false each time the list is opened. See header.onBackClicked
259
95
                    width: root.width
100
            onVisibleChanged: clip = !visible
260
96
                    active: results.count > 0
101
            contentWidth: root.width
261
97
                    visible: active
102
            contentHeight: column.height
262
98
                    sourceComponent: ScopesListCategory {
103
            onContentHeightChanged: returnToBounds();
263
99
                        objectName: "scopesListCategory" + categoryId
104
            Column {
264
100
105
                id: column
265
101
                        model: results
106
                Repeater {
266
102
107
                    model: scope ? scope.categories : null
267
103
                        title: {
108
268
104
                            if (isFavoritesFeed) return i18n.tr("Home");
109
                    delegate: Loader {
269
105
                            else if (isAlsoInstalled) return i18n.tr("Also installed");
110
                        asynchronous: true
270
106
                            else return name;
111
                        width: root.width
271
112
                        active: results.count > 0
272
113
                        visible: active
273
114
                        sourceComponent: ScopesListCategory {
274
115
                            objectName: "scopesListCategory" + categoryId
275
116
276
117
                            Mouse.forwardTo: [autoscroller]
277
118
                            model: results
278
119
                            title: {
279
120
                                if (isFavoritesFeed) return i18n.tr("Home");
280
121
                                else if (isAlsoInstalled) return i18n.tr("Also installed");
281
122
                                else return name;
282
123
                            }
283
124
284
125
                            editMode: root.state === "edit"
285
126
286
127
                            scopeStyle: root.scopeStyle
287
128
                            isFavoritesFeed: categoryId == "favorites"
288
129
                            isAlsoInstalled: categoryId == "other"
289
130
290
131
                            onRequestFavorite: root.requestFavorite(scopeId, favorite);
291
132
                            onRequestEditMode: root.state = "edit";
292
133
                            onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
293
134
                            onRequestActivate: root.scope.activate(result, categoryId);
294
135
                            onRequestRestore: root.requestRestore(scopeId);
295
136
296
137
                            readonly property var contentYChangedTarget: isFavoritesFeed && dragItem.visible ? flickable : null
297
138
                            property double flickableContentYDrag: 0
298
139
                            onContentYChangedTargetChanged: {
299
140
                                if (contentYChangedTarget) {
300
141
                                    flickableContentYDrag = flickable.contentY
301
142
                                }
302
143
                            }
303
144
304
145
305
146
                            // Since tracking the drag item can change the flickable
306
147
                            // size, this "kill switch" prevents overscrolling locally.
307
148
                            // The Autoscroller should take care of everything else.
308
149
                            property bool hasBeenReleased: true
309
150
                            property bool overscrolling: false
310
151
311
152
                            Mouse.onReleased: {
312
153
                                hasBeenReleased = true;
313
154
                                overscrolling = false;
314
155
                            }
315
156
316
157
                            Mouse.onPressed: hasBeenReleased = false;
317
158
318
159
                            Connections {
319
160
                                target: flickable
320
161
                                onAtYEndChanged: {
321
162
                                    if (flickable.atYEnd && !hasBeenReleased) {
322
163
                                        overscrolling = true;
323
164
                                    }
324
165
                                }
325
166
                            }
326
167
327
168
                            property int lastYPos: -1
328
169
                            Connections {
329
170
                                target: contentYChangedTarget
330
171
                                onContentYChanged: {
331
172
                                    // Can't scroll past the bottom if the dragItem is
332
173
                                    // now scrolling towards the top
333
174
                                    if (flickable.contentY < lastYPos) {
334
175
                                        overscrolling = false;
335
176
                                    } else if (overscrolling) {
336
177
                                        return;
337
178
                                    }
338
179
339
180
                                    dragItem.y += (flickable.contentY - flickableContentYDrag);
340
181
                                    flickableContentYDrag = flickable.contentY
341
182
                                    lastYPos = flickable.contentY
342
183
                                }
343
184
                            }
344
107
                        }
185
                        }
345
108
346
109
                        editMode: root.state == "edit"
347
110
348
111
                        scopeStyle: root.scopeStyle
349
112
                        isFavoritesFeed: categoryId == "favorites"
350
113
                        isAlsoInstalled: categoryId == "other"
351
114
352
115
                        onRequestFavorite: root.requestFavorite(scopeId, favorite);
353
116
                        onRequestEditMode: root.state = "edit";
354
117
                        onRequestScopeMoveTo: root.requestFavoriteMoveTo(scopeId, index);
355
118
                        onRequestActivate: root.scope.activate(result, categoryId);
356
119
                        onRequestRestore: root.requestRestore(scopeId);
357
120
                    }
186
                    }
358
121
                }
187
                }
359
122
            }
188
            }
360
123
189
361
=== modified file 'qml/Dash/ScopesListCategory.qml'
362
--- qml/Dash/ScopesListCategory.qml	2016-07-27 16:23:18 +0000
363
+++ qml/Dash/ScopesListCategory.qml	2016-10-18 14:03:36 +0000
364
@@ -29,6 +29,7 @@
365
29
    property bool editMode: false
29
    property bool editMode: false
366
30
    property bool isFavoritesFeed: false
30
    property bool isFavoritesFeed: false
367
31
    property bool isAlsoInstalled: false
31
    property bool isAlsoInstalled: false
368
32
    readonly property alias dragItem: dragItem
369
32
33
370
33
    visible: !editMode || isFavoritesFeed
34
    visible: !editMode || isFavoritesFeed
371
34
35
372
@@ -93,6 +94,7 @@
373
93
94
374
94
                hideChildren: dragItem.loaderToShrink == loader
95
                hideChildren: dragItem.loaderToShrink == loader
375
95
96
376
97
                Mouse.forwardTo: [root]
377
96
                onClicked: {
98
                onClicked: {
378
97
                    if (!editMode) {
99
                    if (!editMode) {
379
98
                        if (root.isFavoritesFeed)
100
                        if (root.isFavoritesFeed)
380
99
101
381
=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
382
--- qml/Dash/ScopesListCategoryItem.qml	2016-03-09 14:14:59 +0000
383
+++ qml/Dash/ScopesListCategoryItem.qml	2016-10-18 14:03:36 +0000
384
@@ -84,19 +84,33 @@
385
84
                visible: text != ""
84
                visible: text != ""
386
85
            }
85
            }
387
86
        }
86
        }
389
87
        AbstractButton {
87
        Item {
390
88
            id: starArea
88
            id: starArea
391
89
            objectName: "starArea"
89
            objectName: "starArea"
392
90
            height: parent.height
90
            height: parent.height
393
91
            width: height
91
            width: height
394
92
            anchors.right: parent.right
92
            anchors.right: parent.right
402
93
            onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite);
93
403
94
            onPressedChanged: {
94
            MouseArea {
404
95
                if (editMode) {
95
                id: mouseArea
405
96
                    if (pressed) root.handlePressed(starArea.__mouseArea);
96
                anchors.fill: parent
406
97
                    else root.handleReleased(starArea.__mouseArea);
97
                Mouse.forwardTo:[starArea]
407
98
                }
98
            }
408
99
            }
99
409
100
            Mouse.forwardTo: [root]
410
101
            Mouse.onClicked: if (!editMode) root.requestFavorite(model.scopeId, !isFavorite);
411
102
            Mouse.onPressed: {
412
103
                if (editMode) {
413
104
                    root.handlePressed(mouseArea);
414
105
                }
415
106
            }
416
107
417
108
            Mouse.onReleased: {
418
109
                if (editMode) {
419
110
                    root.handleReleased(mouseArea);
420
111
                }
421
112
            }
422
113
423
100
            visible: editMode || showStar
114
            visible: editMode || showStar
424
101
            Icon {
115
            Icon {
425
102
                id: star
116
                id: star
426
103
117
427
=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
428
--- tests/mocks/Unity/fake_scopes.cpp	2016-06-07 03:33:35 +0000
429
+++ tests/mocks/Unity/fake_scopes.cpp	2016-10-18 14:03:36 +0000
430
@@ -73,6 +73,13 @@
431
73
    addScope(longNavigationScope);
73
    addScope(longNavigationScope);
432
74
74
433
75
    addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true));
75
    addScope(new Scope("NullPreviewScope", "NPS", false, this, 1, true));
434
76
435
77
    // Add enough scopes to test autoscrolling on the scopes managment page
436
78
    for (int i = 0; i < 20; i++) {
437
79
        addScope(new Scope("UselessScope" + QString::number(i),
438
80
                           "US" + QString::number(i), true, this));
439
81
    }
440
82
441
76
    m_scopesOverview = new ScopesOverview(this);
83
    m_scopesOverview = new ScopesOverview(this);
442
77
84
443
78
    if (!m_loaded) {
85
    if (!m_loaded) {
444
79
86
445
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
446
--- tests/qmltests/Dash/tst_Dash.qml	2016-09-22 07:41:49 +0000
447
+++ tests/qmltests/Dash/tst_Dash.qml	2016-10-18 14:03:36 +0000
448
@@ -58,7 +58,7 @@
449
58
            tryCompare(dashContentList, "count", 0);
58
            tryCompare(dashContentList, "count", 0);
450
59
            scopes.load();
59
            scopes.load();
451
60
            tryCompare(dashContentList, "currentIndex", 0);
60
            tryCompare(dashContentList, "currentIndex", 0);
453
61
            tryCompare(dashContentList, "count", 8);
61
            tryCompare(dashContentList, "count", 28);
454
62
            tryCompare(scopes, "loaded", true);
62
            tryCompare(scopes, "loaded", true);
455
63
            tryCompareFunction(function() {
63
            tryCompareFunction(function() {
456
64
                var mockScope1Loader = findChild(dash, "scopeLoader0");
64
                var mockScope1Loader = findChild(dash, "scopeLoader0");
457
@@ -253,6 +253,9 @@
458
253
            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
253
            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
459
254
            tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
254
            tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
460
255
255
461
256
            // Ensure non favorites are visible
462
257
            flickToYEnd(findChild(dash,"scopesListFlickable"));
463
258
464
256
            // Click on a non favorite scope
259
            // Click on a non favorite scope
465
257
            mouseClick(nonfavScopesListCategoryList.currentItem);
260
            mouseClick(nonfavScopesListCategoryList.currentItem);
466
258
261
467
@@ -502,6 +505,9 @@
468
502
            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
505
            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
469
503
            tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
506
            tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
470
504
507
471
508
            // Ensure non favorite scopes are visible
472
509
            flickToYEnd(findChild(dash, "scopesListFlickable"));
473
510
474
505
            // Click on a non favorite scope
511
            // Click on a non favorite scope
475
506
            mouseClick(nonfavScopesListCategoryList.currentItem);
512
            mouseClick(nonfavScopesListCategoryList.currentItem);
476
507
513
477
508
514
478
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
479
--- tests/qmltests/Dash/tst_DashContent.qml	2016-08-30 09:33:01 +0000
480
+++ tests/qmltests/Dash/tst_DashContent.qml	2016-10-18 14:03:36 +0000
481
@@ -70,7 +70,7 @@
482
70
        function loadScopes() {
70
        function loadScopes() {
483
71
            scopeLoadedSpy.clear();
71
            scopeLoadedSpy.clear();
484
72
            scopesModel.load();
72
            scopesModel.load();
486
73
            tryCompare(scopeLoadedSpy, "count", 8, 15000);
73
            tryCompare(scopeLoadedSpy, "count", 28, 15000);
487
74
            tryCompare(scopesModel, "loaded", true);
74
            tryCompare(scopesModel, "loaded", true);
488
75
            tryCompareFunction(function() {
75
            tryCompareFunction(function() {
489
76
                var mockScope1Loader = findChild(shell, "scopeLoader0");
76
                var mockScope1Loader = findChild(shell, "scopeLoader0");
490
@@ -124,7 +124,7 @@
491
124
124
492
125
            loadScopes();
125
            loadScopes();
493
126
126
495
127
            compare(dashContentList.count, 8);
127
            compare(dashContentList.count, 28);
496
128
            verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
128
            verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
497
129
        }
129
        }
498
130
130
499
@@ -181,7 +181,7 @@
500
181
181
501
182
            // test greater than scope count.
182
            // test greater than scope count.
502
183
            var currentScopeIndex = dashContent.currentIndex;
183
            var currentScopeIndex = dashContent.currentIndex;
504
184
            dashContent.setCurrentScopeAtIndex(18, true, false);
184
            dashContent.setCurrentScopeAtIndex(scopesModel.count, true, false);
505
185
            compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
185
            compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
506
186
        }
186
        }
507
187
187
508
188
188
509
=== modified file 'tests/qmltests/Dash/tst_DashShell.qml'
510
--- tests/qmltests/Dash/tst_DashShell.qml	2016-07-08 20:44:09 +0000
511
+++ tests/qmltests/Dash/tst_DashShell.qml	2016-10-18 14:03:36 +0000
512
@@ -60,7 +60,7 @@
513
60
            tryCompare(dashContentList, "count", 0);
60
            tryCompare(dashContentList, "count", 0);
514
61
            scopes.load();
61
            scopes.load();
515
62
            tryCompare(dashContentList, "currentIndex", 0);
62
            tryCompare(dashContentList, "currentIndex", 0);
517
63
            tryCompare(dashContentList, "count", 8);
63
            tryCompare(dashContentList, "count", 28);
518
64
            tryCompare(scopes, "loaded", true);
64
            tryCompare(scopes, "loaded", true);
519
65
            tryCompareFunction(function() {
65
            tryCompareFunction(function() {
520
66
                var mockScope1Loader = findChild(dash, "scopeLoader0");
66
                var mockScope1Loader = findChild(dash, "scopeLoader0");
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-06-06	Needs Fixing on 2016-10-18
Andrea Cimitan (community)			Needs Information on 2016-08-25
Albert Astals Cid (community)		2016-06-06	Needs Information on 2016-07-06
Josh Arenson			Abstain on 2016-06-29
Review via email: mp+296574@code.launchpad.net