@@ -54,7 +54,6 @@ Item {
5454 property string appId1
5555
5656 onFocusedAppIdChanged: {
57− print("focused appid changed", priv.focusedAppId)
5857 if (priv.focusedAppId.length > 0) {
5958 var focusedApp = ApplicationManager.findApplication(focusedAppId);
6059 if (focusedApp.stage == ApplicationInfoInterface.SideStage) {
@@ -105,17 +104,14 @@ Item {
105104 Connections {
106105 target: ApplicationManager
107106 onFocusRequested: {
108− printStack()
109107 if (spreadView.interactive) {
110108 spreadView.snapTo(priv.indexOf(appId));
111109 } else {
112−// priv.switchToApp(appId);
113110 ApplicationManager.focusApplication(appId)
114111 }
115112 }
116113
117114 onApplicationRemoved: {
118− printStack()
119115 if (priv.mainStageAppId == appId) {
120116 priv.mainStageAppId = "";
121117 }
@@ -127,15 +123,6 @@ Item {
127123 spreadView.contentX = 0;
128124 }
129125 }
130− onApplicationAdded: {
131− printStack()
132− }
133− }
134−
135− function printStack() {
136− for (var i = 0; i < ApplicationManager.count; i++) {
137− print("AppMan item", i, ":", ApplicationManager.get(i).appId)
138− }
139126 }
140127
141128 Flickable {
@@ -187,7 +174,6 @@ Item {
187174 if (ApplicationManager.count <= 2) {
188175 return -1;
189176 }
190− print("nextinstack calculation! appId0", priv.appId0, "appid1", priv.appId1, "MS", priv.mainStageAppId, "SS", priv.sideStageAppId)
191177 if (priv.appId0 == priv.mainStageAppId || priv.appId0 == priv.sideStageAppId) {
192178 if (priv.appId1 == priv.mainStageAppId || priv.appId1 == priv.sideStageAppId) {
193179 return 2;
@@ -196,12 +182,10 @@ Item {
196182 }
197183 return 0;
198184 case "overlay":
199− print("foo", priv.appId0, priv.appId1)
200185 return 1;
201186 }
202− print("unhandled nextInStack case!!!!!");
187+ print("Unhandled nextInStack case! This shouldn't happen any more when the Dash is an app!");
203188 return -1;
204−
205189 }
206190 property int nextZInStack: indexToZIndex(nextInStack)
207191
@@ -251,8 +235,6 @@ Item {
251235 snapAnimation.start();
252236 } else if (contentX < phase1Width) {
253237 snapTo(1)
254−// } else if (contentX < phase1Width + units.gu(5)) {
255−// snapTo(1)
256238 } else {
257239 // Add 1 pixel to make sure we definitely hit positionMarker4 even with rounding errors of the animation.
258240 snapAnimation.targetContentX = spreadView.width * spreadView.positionMarker4 + 1;
@@ -260,9 +242,7 @@ Item {
260242 }
261243 }
262244 function snapTo(index) {
263− print("snapping to index", index)
264245 spreadView.selectedIndex = index;
265−// root.fullscreen = ApplicationManager.get(index).fullscreen;
266246 snapAnimation.targetContentX = 0;
267247 snapAnimation.start();
268248 }
@@ -315,7 +295,6 @@ Item {
315295 target: spreadView
316296 property: "contentX"
317297 to: snapAnimation.targetContentX
318−// duration: UbuntuAnimation.SlowDuration
319298 duration: UbuntuAnimation.FastDuration
320299 }
321300
@@ -400,7 +379,7 @@ Item {
400379 onReleased: {
401380 if (priv.mainStageAppId) {
402381 var oneWayFlick = priv.evaluateOneWayFlick(gesturePoints);
403− sideStageDragSnapAnimation.to = sideStageDragHandle.progress > 0.5 || oneWayFlick ? 1 : 0
382+ sideStageDragSnapAnimation.to = sideStageDragHandle.progress > 0.5 || oneWayFlick ? 1 : 0;
404383 sideStageDragSnapAnimation.start();
405384 } else {
406385 sideStageDragHandle.dragging = false;
@@ -513,8 +492,6 @@ Item {
513492 width: root.dragAreaWidth
514493 direction: Direction.Leftwards
515494
516−// Rectangle { anchors.fill: parent; color: "#4400FF00"}
517−
518495 property bool attachedToView: false
519496 property var gesturePoints: new Array()
520497