Skip to content

Commit d66c7e8

Browse files
Fikset enable/disable og backward bug, og disable/enable i kombinert
1 parent 8653a70 commit d66c7e8

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

Heap/js/View.js

+11-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var View = /** @class */ (function () {
6868
manager.next();
6969
};
7070
View.prototype.stepBack = function () {
71-
if (manager.nextEvents.length <= 0)
71+
if (manager.previousEvents.length <= 0)
7272
return;
7373
if (control.getAlgoName() === "MaxHeapFree" || control.getAlgoName() === "MaxHeap")
7474
this.setPause(true);
@@ -77,6 +77,7 @@ var View = /** @class */ (function () {
7777
firstSelected = -1;
7878
}
7979
else {
80+
lockPlay(false);
8081
manager.previous();
8182
}
8283
};
@@ -137,30 +138,34 @@ var View = /** @class */ (function () {
137138
}
138139
case "MaxHeapCombined": {
139140
this.resetAll();
140-
lockPlay(false);
141141
$("#sortArray").show();
142142
$("#buildHeap, #sortHeap").show();
143143
control.initController(new MaxHeapCombined(10));
144+
this.play();
145+
lockBackForward(true);
146+
lockPlay(false);
144147
break;
145148
}
146149
case "BuildHeap": {
147150
this.resetAll();
148-
lockPlay(false);
149151
control.initController(new BuildHeap(10));
150152
screenLock(true);
151153
control.getAlgorithm().build();
152154
this.setPause(true);
155+
lockPlay(false);
156+
lockBackForward(true);
153157
$("#play").text("Play");
154158
break;
155159
}
156160
case "HeapSort": {
157161
this.resetAll();
158-
lockPlay(false);
159162
$("#sortArray").show();
160163
control.initController(new HeapSort(10));
161164
screenLock(true);
162165
control.getAlgorithm().sort();
163166
this.setPause(true);
167+
lockPlay(false);
168+
lockBackForward(true);
164169
$("#play").text("Play");
165170
break;
166171
}
@@ -343,12 +348,14 @@ var View = /** @class */ (function () {
343348
this.playing = false;
344349
manager.pause();
345350
$("#play").text("Resume");
351+
lockPlay(true);
346352
lockBackForward(false);
347353
}
348354
else {
349355
this.playing = true;
350356
manager.start();
351357
$("#play").text("Pause");
358+
lockPlay(false);
352359
lockBackForward(true);
353360
}
354361
};

Heap/js/View.ts

+11-4
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,15 @@ class View {
8484
}
8585

8686
stepBack() {
87-
if (manager.nextEvents.length <= 0)
87+
if (manager.previousEvents.length <= 0)
8888
return;
8989
if (control.getAlgoName() === "MaxHeapFree" || control.getAlgoName() === "MaxHeap")
9090
this.setPause(true);
9191
if (firstSelected != -1) {
9292
selectIndex(firstSelected, false);
9393
firstSelected = -1;
9494
} else {
95+
lockPlay(false);
9596
manager.previous();
9697
}
9798
}
@@ -159,30 +160,34 @@ class View {
159160
}
160161
case "MaxHeapCombined": {
161162
this.resetAll();
162-
lockPlay(false);
163163
$("#sortArray").show();
164164
$("#buildHeap, #sortHeap").show();
165165
control.initController(new MaxHeapCombined(10));
166+
this.play();
167+
lockBackForward(true);
168+
lockPlay(false);
166169
break;
167170
}
168171
case "BuildHeap": {
169172
this.resetAll();
170-
lockPlay(false);
171173
control.initController(new BuildHeap(10));
172174
screenLock(true);
173175
control.getAlgorithm().build();
174176
this.setPause(true);
177+
lockPlay(false);
178+
lockBackForward(true);
175179
$("#play").text("Play");
176180
break;
177181
}
178182
case "HeapSort": {
179183
this.resetAll();
180-
lockPlay(false);
181184
$("#sortArray").show();
182185
control.initController(new HeapSort(10));
183186
screenLock(true);
184187
(<HeapSort>control.getAlgorithm()).sort();
185188
this.setPause(true);
189+
lockPlay(false);
190+
lockBackForward(true);
186191
$("#play").text("Play");
187192
break;
188193
}
@@ -398,11 +403,13 @@ class View {
398403
this.playing = false;
399404
manager.pause();
400405
$("#play").text("Resume");
406+
lockPlay(true);
401407
lockBackForward(false);
402408
} else {
403409
this.playing = true;
404410
manager.start();
405411
$("#play").text("Pause");
412+
lockPlay(false);
406413
lockBackForward(true);
407414
}
408415
}

0 commit comments

Comments
 (0)