MS: Fjernet mer kode og fikset array knappene

Author: kennidenni

MergeSort/js/InitArray.js

@@ -1,10 +1,5 @@
 ///<reference path="MergeSortAlgorithm.ts"/>
 var array;
-if (typeof javaBinder != "undefined") {
-    console.log = function (msg) {
-        javaBinder.print(msg);
-    };
-}
 var ArrayElement = /** @class */ (function () {
     function ArrayElement(id) {
         this.id = id;
@@ -76,6 +71,7 @@ function getArray(ran) {
     else {
         viewer.serializeArray(array);
         setMyArray(JSON.stringify(array));
+        startMergeSort();
     }
 }
 function checkDupli(arr) {

MergeSort/js/InitArray.ts

@@ -1,15 +1,8 @@
 ///<reference path="MergeSortAlgorithm.ts"/>
 declare var $;
-declare var javaBinder;
 
 let array: number[];
 
-if (typeof javaBinder != "undefined") {
-    console.log = function (msg) {
-        javaBinder.print(msg);
-    }
-}
-
 class ArrayElement {
     left: number;
     id: number;
@@ -93,6 +86,7 @@ function getArray(ran:string) {
     } else {
         viewer.serializeArray(array);
         setMyArray(JSON.stringify(array));
+        startMergeSort();
     }
 }
 

MergeSort/js/MergeSortAlgorithm.js

@@ -1,5 +1,6 @@
 /**
- * File created bu Philip Hoang 12.02.18
+ * File created by Philip Hoang 12.02.18
+ * File designed and written by Kenneth Apeland
  */
 ///<reference path="EventManager.ts"/>
 ///<reference path="View.ts"/>
@@ -9,13 +10,8 @@ var sortArray = [];
 var copyArray = [];
 var running = true;
 function checkIfAlreadyRunning() {
-    if (running) {
-        manager.clear();
-        viewer.pause();
-    }
-    else {
-        running = true;
-    }
+    manager.clear();
+    viewer.setPause();
 }
 function startMergeSort() {
     checkIfAlreadyRunning();

MergeSort/js/MergeSortAlgorithm.ts

@@ -1,5 +1,6 @@
 /**
- * File created bu Philip Hoang 12.02.18
+ * File created by Philip Hoang 12.02.18
+ * File designed and written by Kenneth Apeland
  */
 
 ///<reference path="EventManager.ts"/>
@@ -12,13 +13,8 @@ let copyArray: number[] = [];
 let running = true;
 
 function checkIfAlreadyRunning() {
-    if (running) {
-        manager.clear();
-        viewer.pause();
-    }
-    else {
-        running = true;
-    }
+    manager.clear();
+    viewer.setPause();
 }
 
 function startMergeSort() {

MergeSort/js/Methods.ts

@@ -1,7 +1,6 @@
 ///<reference path="InitArray.ts"/>
 
 declare var $;
-declare var javaBinder;
 var insElemNr = "insElemNr";
 var LEVEL_HEIGHT: number = 85;
 

MergeSort/js/View.js

@@ -115,26 +115,23 @@ var view = /** @class */ (function () {
         }(element, px);
         manager.addEvent(new FrontendEvent(forwardSteps, forwardSteps, this.animSpeed));
     };
-    /*
-      setRandomArray() {
-        manager.clear();
-        manager.start();
-        controller.setRandomArray();
-        arrayIsReset = true;
-      }
-     */
     view.prototype.pause = function () {
         if (!this.paused) {
             this.paused = true;
             manager.pause();
-            $("#togglePause").html("resume");
+            $("#togglePause").html("Resume");
         }
         else {
             this.paused = false;
             manager.unpause();
-            $("#togglePause").html("pause");
+            $("#togglePause").html("Pause");
         }
     };
+    view.prototype.setPause = function () {
+        this.paused = true;
+        manager.pause();
+        $("#togglePause").html("Start");
+    };
     view.prototype.forward = function () {
         manager.next();
     };

MergeSort/js/View.ts

@@ -5,13 +5,6 @@
  * File created by Philip Hoang 12.2.18
  */
 
-/*
- Note to self; Funksjoner som ikke finnes i Methods.ts, men som blir kalt her
- - setPosition()
- - swapId()
- - setColor()
- */
-
 declare var $;
 
 class view {
@@ -150,28 +143,24 @@ class view {
         manager.addEvent(new FrontendEvent(forwardSteps, forwardSteps, this.animSpeed));
     }
 
-
-    /*
-      setRandomArray() {
-        manager.clear();
-        manager.start();
-        controller.setRandomArray();
-        arrayIsReset = true;
-      }
-     */
-
     pause() {
         if (!this.paused) {
             this.paused = true;
             manager.pause();
-            $("#togglePause").html("resume");
+            $("#togglePause").html("Resume");
         } else {
             this.paused = false;
             manager.unpause();
-            $("#togglePause").html("pause");
+            $("#togglePause").html("Pause");
         }
     }
 
+    setPause() {
+        this.paused = true;
+        manager.pause();
+        $("#togglePause").html("Start");
+    }
+
     forward() {
         manager.next();
     }