Slite fortsatt litt med view, men har laget tomme metoder

Author: kennidenni

PortJob/UnionFind/js/bootstrap.min.js

@@ -5,7 +5,7 @@
 declare var $;
 declare var javaLog;
 
-var animationTime: number = 2500;
+var animationTime:number = 2500;
 var idCounter = 0;
 
 class GraphNode {
@@ -18,7 +18,7 @@ class GraphNode {
     top: number;
     connectedLines: Array<Line>;
 
-    constructor(id: number, value: number) {
+    constructor(id:number, value:number) {
         this.id = id;
         this.value = value;
         this.children = new Array;
@@ -28,7 +28,7 @@ class GraphNode {
         this.top = 0;
     }
 
-    positionNode(xLayer: number, yLayer: number, time: number): number {
+    positionNode(xLayer:number, yLayer:number, time:number) : number {
 
         // Basis
         if (this.children.length == 0) {
@@ -42,16 +42,16 @@ class GraphNode {
                 xLayer = child.positionNode(xLayer, yLayer + 1, time);
             }
 
-            var rightChildNodeLeft: number = this.children[this.children.length - 1].left;
-            var leftChildNodeLeft: number = this.children[0].left;
+            var rightChildNodeLeft : number = this.children[this.children.length - 1].left;
+            var leftChildNodeLeft : number = this.children[0].left;
             var x = ((rightChildNodeLeft - leftChildNodeLeft) / 2) + leftChildNodeLeft;
 
             this.moveBothDirections(x, yLayer * 50, time);
             return xLayer;
         }
     }
 
-    addChild(child: GraphNode) {
+    addChild(child : GraphNode) {
         // remove from last parents child list
         if (child.parent !== undefined && child.parent !== null) {
             child.parent.removeChild(child);
@@ -61,7 +61,7 @@ class GraphNode {
         this.children.push(child);
 
         //Add line
-        var line: Line = new Line(idCounter++, this, child);
+        var line : Line = new Line(idCounter++, this, child);
         this.connectedLines.push(line);
         child.connectedLines.push(line);
     }
@@ -70,7 +70,7 @@ class GraphNode {
     removeChild(child: GraphNode) {
         //Remove child from children-array
         if (this.children.indexOf(child) != -1) {
-            var index: number = this.children.indexOf(child);
+            var index:number = this.children.indexOf(child);
             this.children.splice(index, 1);
         }
 
@@ -79,7 +79,7 @@ class GraphNode {
         }
 
         //Remove the line between us
-        var line: Line = this.removeLineToNode(child);
+        var line:Line = this.removeLineToNode(child);
         child.removeLineToNode(this);
 
         //Remove the line from the screen
@@ -89,27 +89,27 @@ class GraphNode {
 
     }
 
-    removeLineToNode(node: GraphNode): Line {
-        for (var i: number = 0; i < this.connectedLines.length; i++) {
+    removeLineToNode(node : GraphNode) : Line {
+        for (var i : number = 0; i < this.connectedLines.length; i++) {
             if (this.connectedLines[i].child.id == node.id || this.connectedLines[i].parent.id == node.id) {
                 return this.connectedLines.splice(i, 1)[0]; //Remove from array and return the line (for screen removal)
             }
         }
     }
 
-    moveSideways(newLeftValue: number, time: number) {
+    moveSideways(newLeftValue:number, time:number) {
         this.left = newLeftValue;
-        $("#node" + this.id).clearQueue().animate({left: newLeftValue + "px"}, time);
-        for (var i: number = 0; i < this.connectedLines.length; i++) {
+        $("#node" + this.id).clearQueue().animate({left : newLeftValue + "px"}, time);
+        for (var i : number = 0; i < this.connectedLines.length; i++) {
             this.connectedLines[i].animateLinePoint(this, time);
         }
     }
 
-    moveBothDirections(newLeftValue: number, newTopValue: number, time: number) {
+    moveBothDirections(newLeftValue:number, newTopValue:number, time:number) {
         this.left = newLeftValue;
         this.top = newTopValue;
-        $("#node" + this.id).clearQueue().animate({left: newLeftValue + "px", top: newTopValue + "px"}, time);
-        for (var i: number = 0; i < this.connectedLines.length; i++) {
+        $("#node" + this.id).clearQueue().animate({left: newLeftValue + "px", top : newTopValue + "px"}, time);
+        for (var i : number = 0; i < this.connectedLines.length; i++) {
             this.connectedLines[i].animateLinePoint(this, time);
         }
     }
@@ -125,11 +125,11 @@ class GraphNode {
 
 // This class holds information about svg-lines between nodes
 class Line {
-    id: number;
-    parent: GraphNode;
-    child: GraphNode;
+    id : number;
+    parent : GraphNode;
+    child : GraphNode;
 
-    constructor(id: number, parent: GraphNode, child: GraphNode) {
+    constructor(id : number, parent : GraphNode, child : GraphNode) {
         this.id = id;
         this.parent = parent;
         this.child = child;
@@ -138,55 +138,39 @@ class Line {
         var $parent = $("#node" + parent.id);
         var $child = $("#node" + child.id);
         // JQuery have no support for creating svg elements yet, using JavaScript instead
-        var newLine = document.createElementNS('http://www.w3.org/2000/svg', 'line');
-        newLine.setAttribute('id', 'line' + this.id);
-        newLine.setAttribute('x1', $parent.position().left + width / 2);
-        newLine.setAttribute('y1', $parent.position().top + width / 2);
-        newLine.setAttribute('x2', $child.position().left + width / 2);
-        newLine.setAttribute('y2', $child.position().top + width / 2); // TODO: Line is placed too late after node has moved
+        var newLine = document.createElementNS('http://www.w3.org/2000/svg','line');
+        newLine.setAttribute('id' , 'line' + this.id);
+        newLine.setAttribute('x1' , $parent.position().left + width/2);
+        newLine.setAttribute('y1' , $parent.position().top + width/2);
+        newLine.setAttribute('x2' , $child.position().left + width/2);
+        newLine.setAttribute('y2' , $child.position().top + width/2); // TODO: Line is placed too late after node has moved
         $("#graphUL svg#lines").append(newLine);
         $("#line" + id).removeClass('hidden');
     }
 
     //Animate either the child side of the line or the parent side based on what node is passed
-    animateLinePoint(node: GraphNode, animationTime: number) {
-        var width: number = $("#node" + node.id).outerWidth();
+    animateLinePoint(node:GraphNode, animationTime:number) {
+        var width : number = $("#node" + node.id).outerWidth();
 
         var $line = $("#line" + this.id);
-        var parentPoint: boolean = (this.parent.id == node.id);
+        var parentPoint:boolean = (this.parent.id == node.id);
         if (parentPoint) {
-            $({x1: $line.attr('x1')})
-                .animate({x1: this.parent.left + width / 2}, {
-                    duration: animationTime, step: function (now) {
-                        $line.attr('x1', now);
-                    }
-                });
-            $({y1: $line.attr('y1')})
-                .animate({y1: this.parent.top + width / 2}, {
-                    duration: animationTime, step: function (now) {
-                        $line.attr('y1', now);
-                    }
-                });
+            $({x1:$line.attr('x1')})
+                .animate({x1: this.parent.left + width/2}, {duration:animationTime,step:function(now){$line.attr('x1', now);}});
+            $({y1:$line.attr('y1')})
+                .animate({y1: this.parent.top + width/2}, {duration:animationTime,step:function(now){$line.attr('y1', now);}});
         } else {
             $({x2: $line.attr('x2')})
-                .animate({x2: this.child.left + width / 2}, {
-                    duration: animationTime, step: function (now) {
-                        $line.attr('x2', now);
-                    }
-                });
+                .animate({x2: this.child.left + width/2}, {duration: animationTime, step: function (now) {$line.attr('x2', now);}});
             $({y2: $line.attr('y2')})
-                .animate({y2: this.child.top + width / 2}, {
-                    duration: animationTime, step: function (now) {
-                        $line.attr('y2', now);
-                    }
-                });
+                .animate({y2: this.child.top + width/2}, {duration: animationTime, step: function (now) {$line.attr('y2', now);}});
         }
     }
 }
 
 // Top node - not visible
-var superNode: GraphNode = new GraphNode(-1, 0);
-var allNodes: Array<GraphNode> = new Array;
+var superNode : GraphNode = new GraphNode(-1, 0);
+var allNodes : Array<GraphNode> = new Array;
 
 function createAndDrawNodes(numberOfNodes) {
 
@@ -195,8 +179,8 @@ function createAndDrawNodes(numberOfNodes) {
     superNode.children = new Array;
     allNodes = new Array;
 
-    for (var i = 0; i < numberOfNodes; i++) {
-        var node: GraphNode = new GraphNode(i, i);
+    for (var i=0; i<numberOfNodes; i++) {
+        var node : GraphNode = new GraphNode(i, i);
 
         // Add node to nodeList
         allNodes.push(node);
@@ -213,18 +197,18 @@ function createAndDrawNodes(numberOfNodes) {
     positioningNodes(1500);
 }
 
-function positioningNodes(time: number) {
+function positioningNodes(time:number) {
     // Position the whole graph
     superNode.positionNode(0, -1, time);
     centerDivWidthNodes(time);
 }
 
-function getTotalWidthOfNodes(): number {
-    var leftNodePx: number = 2000;
-    var rightNodePx: number = -2000;
-    var width: number = 0;
-    allNodes.forEach(function (node) {
-        var left: number = node.left;
+function getTotalWidthOfNodes() : number {
+    var leftNodePx : number = 2000;
+    var rightNodePx : number = -2000;
+    var width : number = 0;
+    allNodes.forEach(function(node) {
+        var left : number = node.left;
         if (left < leftNodePx) {
             leftNodePx = left;
         }
@@ -237,32 +221,30 @@ function getTotalWidthOfNodes(): number {
 }
 
 function getSpaceBetweenDivAndLeftNode() {
-    var divWidth: number = $("div#nodes").width();
+    var divWidth : number = $("div#nodes").width();
     return divWidth / 2 - getTotalWidthOfNodes() / 2;
 }
 
-function centerDivWidthNodes(time: number): void {
+function centerDivWidthNodes(time:number) : void {
     $("#graphUL").finish(); // if already animating, finish animation
-    $("#graphUL").animate({left: getSpaceBetweenDivAndLeftNode()}, time);
+    $("#graphUL").animate({ left : getSpaceBetweenDivAndLeftNode() }, time);
 }
 
-window.addEventListener('resize', function () {
-    centerDivWidthNodes(animationTime)
-});
+window.addEventListener('resize', function() { centerDivWidthNodes(animationTime) });
 
-function getGraphState(): string {
-    var state: Array<Array<number>> = [];
-    for (var nodeIndex: number = 0; nodeIndex < allNodes.length; nodeIndex++) {
+function getGraphState() : string{
+    var state:Array<Array<number>> = [];
+    for (var nodeIndex:number = 0; nodeIndex < allNodes.length; nodeIndex++) {
         state.push(new Array);
-        for (var childIndex: number = 0; childIndex < allNodes[nodeIndex].children.length; childIndex++) {
+        for (var childIndex:number = 0; childIndex < allNodes[nodeIndex].children.length; childIndex++) {
             state[nodeIndex].push(allNodes[nodeIndex].children[childIndex].id);
         }
     }
     return JSON.stringify(state).toString();
 }
 
-function getArrayState(): string {
-    var state: Array<number> = [];
+function getArrayState() : string {
+    var state:Array<number> = [];
 
     for (var i = 0; i < allNodes.length; i++) {
         state.push(parseInt($("#arrayElem" + i + " div.content").text()));