Code cleanup / improvements

.gitignore

@@ -0,0 +1 @@
+.vscode

AlgorithmLibrary/AVL.js

@@ -29,10 +29,7 @@ function AVL(am, w, h)
 	this.init(am, w, h);
 
 }
-
-AVL.prototype = new Algorithm();
-AVL.prototype.constructor = AVL;
-AVL.superclass = Algorithm.prototype;
+AVL.inheritFrom(Algorithm);
 
 
 // Various constants
@@ -83,19 +80,19 @@ AVL.prototype.init = function(am, w, h)
 
 AVL.prototype.addControls =  function()
 {
-	this.insertField = addControlToAlgorithmBar("Text", "");
+	this.insertField = this.addControlToAlgorithmBar("Text", "");
 	this.insertField.onkeydown = this.returnSubmit(this.insertField,  this.insertCallback.bind(this), 4);
-	this.insertButton = addControlToAlgorithmBar("Button", "Insert");
+	this.insertButton = this.addControlToAlgorithmBar("Button", "Insert");
 	this.insertButton.onclick = this.insertCallback.bind(this);
-	this.deleteField = addControlToAlgorithmBar("Text", "");
+	this.deleteField = this.addControlToAlgorithmBar("Text", "");
 	this.deleteField.onkeydown = this.returnSubmit(this.deleteField,  this.deleteCallback.bind(this), 4);
-	this.deleteButton = addControlToAlgorithmBar("Button", "Delete");
+	this.deleteButton = this.addControlToAlgorithmBar("Button", "Delete");
 	this.deleteButton.onclick = this.deleteCallback.bind(this);
-	this.findField = addControlToAlgorithmBar("Text", "");
+	this.findField = this.addControlToAlgorithmBar("Text", "");
 	this.findField.onkeydown = this.returnSubmit(this.findField,  this.findCallback.bind(this), 4);
-	this.findButton = addControlToAlgorithmBar("Button", "Find");
+	this.findButton = this.addControlToAlgorithmBar("Button", "Find");
 	this.findButton.onclick = this.findCallback.bind(this);
-	this.printButton = addControlToAlgorithmBar("Button", "Print");
+	this.printButton = this.addControlToAlgorithmBar("Button", "Print");
 	this.printButton.onclick = this.printCallback.bind(this);
 }
 

AlgorithmLibrary/Algorithm.js

@@ -24,100 +24,6 @@
 // authors and should not be interpreted as representing official policies, either expressed
 // or implied, of the University of San Francisco
 
-function addLabelToAlgorithmBar(labelName)
-{
-    var element = document.createTextNode(labelName);
-
-	var tableEntry = document.createElement("td");	
-	tableEntry.appendChild(element);
-
-
-    var controlBar = document.getElementById("AlgorithmSpecificControls");
-
-    //Append the element in page (in span).
-    controlBar.appendChild(tableEntry);
-	return element;
-}
-
-// TODO:  Make this stackable like radio butons
-//        (keep backwards compatible, thought)
-function addCheckboxToAlgorithmBar(boxLabel)
-{	
-	var element = document.createElement("input");
-
-    element.setAttribute("type", "checkbox");
-    element.setAttribute("value", boxLabel);
-
-    var label = document.createTextNode(boxLabel);
-
-	var tableEntry = document.createElement("td");	
-	tableEntry.appendChild(element);
-	tableEntry.appendChild(label);
-
-    var controlBar = document.getElementById("AlgorithmSpecificControls");
-
-    //Append the element in page (in span).
-    controlBar.appendChild(tableEntry);
-	return element;
-}
-
-function addRadioButtonGroupToAlgorithmBar(buttonNames, groupName)
-{
-	var buttonList = [];
-	var newTable = document.createElement("table");
-
-	for (var i = 0; i < buttonNames.length; i++)
-	{
-		var midLevel = document.createElement("tr");
-		var bottomLevel = document.createElement("td");
-
-		var button = document.createElement("input");
-		button.setAttribute("type", "radio");
-		button.setAttribute("name", groupName);
-		button.setAttribute("value", buttonNames[i]);
-		bottomLevel.appendChild(button);
-		midLevel.appendChild(bottomLevel);
-		var txtNode = document.createTextNode(" " + buttonNames[i]); 
-		bottomLevel.appendChild(txtNode);
-		newTable.appendChild(midLevel);	
-		buttonList.push(button);
-	}
-
-	var topLevelTableEntry = document.createElement("td");
-	topLevelTableEntry.appendChild(newTable);
-
-	var controlBar = document.getElementById("AlgorithmSpecificControls");
-	controlBar.appendChild(topLevelTableEntry);
-
-	return buttonList
-}
-
-
-function addControlToAlgorithmBar(type, name) {
-
-    var element = document.createElement("input");
-
-    element.setAttribute("type", type);
-    element.setAttribute("value", name);
-//    element.setAttribute("name", name);
-
-
-	var tableEntry = document.createElement("td");
-
-	tableEntry.appendChild(element);
-
-
-    var controlBar = document.getElementById("AlgorithmSpecificControls");
-
-    //Append the element in page (in span).
-    controlBar.appendChild(tableEntry);
-	return element;
-
-}
-
-
-
-
 function Algorithm(am)
 {
 
@@ -396,3 +302,101 @@ Algorithm.prototype.cmd = function()
 	}
 
 }
+
+// Algorithm bar methods //////////////////
+
+Algorithm.prototype.addLabelToAlgorithmBar = function(labelName)
+{
+    var element = document.createTextNode(labelName);
+
+	var tableEntry = document.createElement("td");	
+	tableEntry.appendChild(element);
+
+    //Append the element in page (in span).
+    var controlBar = this.animationManager.algorithmControlBar;
+	if(controlBar)
+		controlBar.appendChild(tableEntry);
+
+	return element;
+}
+
+// TODO:  Make this stackable like radio butons
+//        (keep backwards compatible, thought)
+Algorithm.prototype.addCheckboxToAlgorithmBar = function(boxLabel)
+{	
+	var element = document.createElement("input");
+
+    element.setAttribute("type", "checkbox");
+    element.setAttribute("value", boxLabel);
+
+    var label = document.createTextNode(boxLabel);
+
+	var tableEntry = document.createElement("td");	
+	tableEntry.appendChild(element);
+	tableEntry.appendChild(label);
+
+    //Append the element in page (in span).
+    var controlBar = this.animationManager.algorithmControlBar;
+	if(controlBar)
+		controlBar.appendChild(tableEntry);
+
+	return element;
+}
+
+Algorithm.prototype.addRadioButtonGroupToAlgorithmBar = function(buttonNames, groupName)
+{
+	var buttonList = [];
+	var newTable = document.createElement("table");
+
+	for (var i = 0; i < buttonNames.length; i++)
+	{
+		var midLevel = document.createElement("tr");
+		var bottomLevel = document.createElement("td");
+
+		var button = document.createElement("input");
+		button.setAttribute("type", "radio");
+		button.setAttribute("name", groupName);
+		button.setAttribute("value", buttonNames[i]);
+		bottomLevel.appendChild(button);
+		midLevel.appendChild(bottomLevel);
+		var txtNode = document.createTextNode(" " + buttonNames[i]); 
+		bottomLevel.appendChild(txtNode);
+		newTable.appendChild(midLevel);	
+		buttonList.push(button);
+	}
+
+	var topLevelTableEntry = document.createElement("td");
+	topLevelTableEntry.appendChild(newTable);
+
+	var controlBar = this.animationManager.algorithmControlBar;
+	if(controlBar)
+		controlBar.appendChild(topLevelTableEntry);
+
+	return buttonList
+}
+
+
+Algorithm.prototype.addControlToAlgorithmBar = function(type, name) {
+
+    var element = document.createElement("input");
+
+    element.setAttribute("type", type);
+    element.setAttribute("value", name);
+//    element.setAttribute("name", name);
+
+
+	var tableEntry = document.createElement("td");
+
+	tableEntry.appendChild(element);
+
+    //Append the element in page (in span).
+    var controlBar = this.animationManager.algorithmControlBar;
+	if(controlBar)
+		controlBar.appendChild(tableEntry);
+
+	return element;
+
+}
+
+
+