@@ -28,29 +28,42 @@ Showable {
2828
2929 visible: shown
3030
31+ Connections {
32+ target: UriHandler
33+ onOpened: {
34+ backToDashContent()
35+ dashContent.scope.performQuery(uris[0])
36+ }
37+ }
38+
3139 DashCommunicatorService {
3240 objectName: "dashCommunicatorService"
3341 onSetCurrentScopeRequested: {
3442 if (!isSwipe || !window.active || bottomEdgeController.progress != 0 || scopeItem.scope || dashContent.subPageShown) {
3543 if (bottomEdgeController.progress != 0 && window.active) animate = false;
3644 dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)
37− // Close dash overview and nested temp scopes in it
38− if (bottomEdgeController.progress != 0) {
39− bottomEdgeController.enableAnimation = window.active;
40− bottomEdgeController.progress = 0;
41− }
42− // Close normal temp scopes (e.g. App Store)
43− if (scopeItem.scope) {
44− scopeItem.backClicked();
45− }
46− // Close previews
47− if (dashContent.subPageShown) {
48− dashContent.closePreview();
49− }
45+ backToDashContent()
5046 }
5147 }
5248 }
5349
50+ function backToDashContent()
51+ {
52+ // Close dash overview and nested temp scopes in it
53+ if (bottomEdgeController.progress != 0) {
54+ bottomEdgeController.enableAnimation = window.active;
55+ bottomEdgeController.progress = 0;
56+ }
57+ // Close normal temp scopes (e.g. App Store)
58+ if (scopeItem.scope) {
59+ scopeItem.backClicked();
60+ }
61+ // Close previews
62+ if (dashContent.subPageShown) {
63+ dashContent.closePreview();
64+ }
65+ }
66+
5467 function setCurrentScope(scopeId, animate, reset) {
5568 var scopeIndex = -1;
5669 for (var i = 0; i < scopes.count; ++i) {