Fikset trykking på elementer etter man har lagt til nytt - Fikset highlighting bug

Author: theghostrecords

Heap/css/heap_style.css

@@ -103,11 +103,11 @@ ul#graphUL li.wrong {
 }
 
 /** WARNING: Do not change the name of "green" or "orange" class. Js uses strings sent from java to set class **/
-ul#graphUL li.green, ul#sortArrayUL li.green div.content, ul#arrayUL li.child div.content {
+ul#graphUL li.green, ul#sortArrayUL li.green div.content, ul#arrayUL li.child div.content, ul#arrayUL li.green div.content {
     border: 3px solid rgb(0, 204, 0);
 }
 
-ul#graphUL li.orange {
+ul#graphUL li.orange, ul#arrayUL li.orange div.content {
     border: 3px solid rgb(255, 117, 26);
 }
 

Heap/js/MaxHeap.js

@@ -157,6 +157,8 @@ var MaxHeap = /** @class */ (function () {
         var other = Math.floor((index - 1) / 2);
         while (other >= 0 && this.array[index] > this.array[other]) {
             this.exch(index, other);
+            control.highlightTwoNodes(index, other, "green");
+            control.removeHighlightTwoNodes(index, other, "green");
             index = Math.floor((index - 1) / 2);
             other = Math.floor((index - 1) / 2);
         }

Heap/js/MaxHeap.ts

@@ -181,6 +181,8 @@ class MaxHeap implements IAlgorithm {
         let other: number = Math.floor((index - 1) / 2);
         while (other >= 0 && this.array[index] > this.array[other]) {
             this.exch(index, other);
+            control.highlightTwoNodes(index, other, "green");
+            control.removeHighlightTwoNodes(index, other, "green");
             index = Math.floor((index - 1) / 2);
             other = Math.floor((index - 1) / 2);
         }

Heap/js/View.js

@@ -165,7 +165,6 @@ var View = /** @class */ (function () {
     };
     View.prototype.addNode = function (val) {
         control.addNode(val);
-        setOnClickListener();
         setupRadio();
     };
     View.prototype.removeNode = function () {
@@ -210,6 +209,7 @@ var View = /** @class */ (function () {
                 setValueAtIndex(index, value);
                 insertNewNode(index, value);
                 insertNewElemConnect(index, parent);
+                setOnClickListener();
                 // If first node -> Position with a nice animation
                 if (control.getAlgorithm().getArrayLength() == 1)
                     positioningNodes(1500);

Heap/js/View.ts

@@ -190,7 +190,6 @@ class View {
 
     addNode(val: number) {
         control.addNode(val);
-        setOnClickListener();
         setupRadio();
     }
 
@@ -244,6 +243,7 @@ class View {
                 setValueAtIndex(index, value);
                 insertNewNode(index, value);
                 insertNewElemConnect(index, parent);
+                setOnClickListener();
 
                 // If first node -> Position with a nice animation
                 if (control.getAlgorithm().getArrayLength() == 1)

Heap/js/methods.js

@@ -33,11 +33,6 @@ function setOnClickListener() {
             for (var i = 0; i < id.length; i++)
                 if (!isNaN(parseInt(id[i])))
                     idInt += id[i];
-            if (isHighlighted(parseInt(idInt))) {
-                deselectArrayElemSelections();
-                deselectNodeSelections();
-                return;
-            }
             selectElement(parseInt(idInt));
         });
     });
@@ -225,10 +220,11 @@ function deselectArrayElement(index) {
 }
 function highlightNode(index, color) {
     if (color.toLowerCase() == "green" || color.toLowerCase() == "orange") {
-        $("#arrayElem" + index + ", #node" + index).each(function () {
+        $("#node" + index).each(function () {
             removeHighlight(index);
             $(this).addClass(color);
         });
+        $("#arrayElem" + index).addClass(color);
     }
     else {
         console.log("*** WARNING: Unknown color, " + color + " *** ");

Heap/js/methods.ts

@@ -36,11 +36,6 @@ function setOnClickListener() {
             for (let i = 0; i < id.length; i++)
                 if (!isNaN(parseInt(id[i])))
                     idInt += id[i];
-            if (isHighlighted(parseInt(idInt))) {
-                deselectArrayElemSelections();
-                deselectNodeSelections();
-                return;
-            }
             selectElement(parseInt(idInt));
         });
     });
@@ -262,10 +257,11 @@ function deselectArrayElement(index: number) {
 
 function highlightNode(index: number, color: String) {
     if (color.toLowerCase() == "green" || color.toLowerCase() == "orange") {
-        $("#arrayElem" + index + ", #node" + index).each(function () {
+        $("#node" + index).each(function () {
             removeHighlight(index);
             $(this).addClass(color);
         });
+        $("#arrayElem" + index).addClass(color);
     } else {
         console.log("*** WARNING: Unknown color, " + color + " *** ");
     }