diff --git a/Web/ui.js b/Web/ui.js index a9519f5..4bd6b6b 100644 --- a/Web/ui.js +++ b/Web/ui.js @@ -182,7 +182,7 @@ function PrintScreen(WhatPassedIn=-1) //console.log("We have something selected."); var tmp_select = returnHighlightShape("selectbox", ui_selectRect, "green", "none", 0.8); drawshape(tmp_select); - } + } drawSelectMenu(); PrintAllNetworkLinks(); @@ -688,23 +688,22 @@ function makeLine(x1, y1, x2, y2, offsetx = 0, offsety = 0) { } //Make a structure to hold all our data -function actionStruct(shapeText, shapePoints, theObject=null, funcLeftClick=null, funcRightClick=null, funcMouseover=null) { - var struct = { - shapeText: shapeText, - shapePoints: structuredClone(shapePoints), - theObject: theObject, - funcLeftClick: funcLeftClick, - funcRightClick: funcRightClick, - funcMouseover: funcMouseover, +class actionStruct { +constructor(shapeText, shapePoints, theObject=null, funcLeftClick=null, funcRightClick=null, funcMouseover=null) { + + this.shapeText= shapeText + this.shapePoints= structuredClone(shapePoints) + this.shapePoints.shapeText = shapeText; + this.theObject= theObject + this.funcLeftClick= funcLeftClick + this.funcRightClick= funcRightClick + this.funcMouseover= funcMouseover } - //if (shapeText == "line") console.log("Creating a line: " + JSON.stringify(struct)); - shapePoints.shapeText = shapeText; - return struct; } function registerActionStruct(shapeText, shapePoints, theObject=null, funcLeftClick=null, funcRightClick=null, funcMouseover=null) { //Make an object with all the data - var what = actionStruct(shapeText, shapePoints, theObject, funcLeftClick, funcRightClick, funcMouseover); + var what = new actionStruct(shapeText, shapePoints, theObject, funcLeftClick, funcRightClick, funcMouseover); //console.log("Pushing an action: " + shapeText); //Push it onto the uiActions list uiActions.unshift(what); //Put it at the beginning of the list @@ -881,9 +880,9 @@ function device_clickOn(point, actionrec) { //here we get all the problem statements and combine them errors = returnProblemStrings(actionrec.theObject); additional = " " + errors.join(' - '); - } - } - } + } + } + } setStatus(actionrec.theObject.hostname + additional); //We probably do not want to do printecreen here, but we are doing it here now...