Skip to content

Commit 6a74d10

Browse files
endret hastighet - fikset hastighet bug
1 parent 02c74b3 commit 6a74d10

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

Heap/js/View.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,22 @@ var View = /** @class */ (function () {
113113
}
114114
};
115115
View.prototype.setSlow = function () {
116-
manager.delayTime = 1800;
116+
manager.delayTime = 2000;
117117
this.restartManager();
118118
};
119119
View.prototype.setMedium = function () {
120-
manager.delayTime = 1000;
120+
manager.delayTime = 1200;
121121
this.restartManager();
122122
};
123123
View.prototype.setFast = function () {
124124
manager.delayTime = 600;
125125
this.restartManager();
126126
};
127127
View.prototype.restartManager = function () {
128-
manager.pause();
129-
manager.start();
128+
if (this.playing) {
129+
manager.pause();
130+
manager.start();
131+
}
130132
};
131133
View.prototype.switchAlgorithm = function (algo) {
132134
$("#sortArray").hide();

Heap/js/View.ts

+13-11
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ class View {
131131
}
132132

133133
setSlow() {
134-
manager.delayTime = 1800;
134+
manager.delayTime = 2000;
135135
this.restartManager();
136136
}
137137

138138
setMedium() {
139-
manager.delayTime = 1000;
139+
manager.delayTime = 1200;
140140
this.restartManager();
141141
}
142142

@@ -146,8 +146,10 @@ class View {
146146
}
147147

148148
restartManager() {
149-
manager.pause();
150-
manager.start();
149+
if (this.playing) {
150+
manager.pause();
151+
manager.start();
152+
}
151153
}
152154

153155
switchAlgorithm(algo: string) {
@@ -174,7 +176,7 @@ class View {
174176
control.initController(new MaxHeapCombined(10));
175177
this.play();
176178
lockBackForward(true);
177-
lockPlay(false);
179+
lockPlay(false);
178180
break;
179181
}
180182
case "BuildHeap": {
@@ -183,8 +185,8 @@ class View {
183185
screenLock(true);
184186
control.getAlgorithm().build();
185187
this.setPause(true);
186-
lockPlay(false);
187-
lockBackForward(true);
188+
lockPlay(false);
189+
lockBackForward(true);
188190
$("#play").text("Play");
189191
break;
190192
}
@@ -195,8 +197,8 @@ class View {
195197
screenLock(true);
196198
(<HeapSort>control.getAlgorithm()).sort();
197199
this.setPause(true);
198-
lockPlay(false);
199-
lockBackForward(true);
200+
lockPlay(false);
201+
lockBackForward(true);
200202
$("#play").text("Play");
201203
break;
202204
}
@@ -221,7 +223,7 @@ class View {
221223
}
222224

223225
sortHeap() {
224-
control.buildHeap();
226+
control.buildHeap();
225227
control.sortHeap();
226228
}
227229

@@ -412,7 +414,7 @@ class View {
412414
this.playing = false;
413415
manager.pause();
414416
$("#play").text("Resume");
415-
lockPlay(false);
417+
lockPlay(false);
416418
lockBackForward(false);
417419
} else {
418420
this.playing = true;

0 commit comments

Comments
 (0)