Merge branch 'master' of https://github.com/kennidenni/INF219

Author: Kenneth Apeland

Heap/js/View.js

@@ -113,20 +113,22 @@ var View = /** @class */ (function () {
         }
     };
     View.prototype.setSlow = function () {
-        manager.delayTime = 1500;
+        manager.delayTime = 2000;
         this.restartManager();
     };
     View.prototype.setMedium = function () {
-        manager.delayTime = 1000;
+        manager.delayTime = 1200;
         this.restartManager();
     };
     View.prototype.setFast = function () {
         manager.delayTime = 600;
         this.restartManager();
     };
     View.prototype.restartManager = function () {
-        manager.pause();
-        manager.start();
+        if (this.playing) {
+            manager.pause();
+            manager.start();
+        }
     };
     View.prototype.switchAlgorithm = function (algo) {
         $("#sortArray").hide();

Heap/js/View.ts

@@ -131,12 +131,12 @@ class View {
     }
 
     setSlow() {
-        manager.delayTime = 1500;
+        manager.delayTime = 2000;
         this.restartManager();
     }
 
     setMedium() {
-        manager.delayTime = 1000;
+        manager.delayTime = 1200;
         this.restartManager();
     }
 
@@ -146,8 +146,10 @@ class View {
     }
 
     restartManager() {
-        manager.pause();
-        manager.start();
+        if (this.playing) {
+            manager.pause();
+            manager.start();
+        }
     }
 
     switchAlgorithm(algo: string) {