diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/app.min.js b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/app.min.js index 1b119c6756..af869e2bfb 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/app.min.js +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/app.min.js @@ -922,10 +922,9 @@ mxGraphModel.prototype.setCreateIds=function(a){this.createIds=a};mxGraphModel.p mxGraphModel.prototype.filterDescendants=function(a,b){var c=[];b=b||this.getRoot();(null==a||a(b))&&c.push(b);for(var d=this.getChildCount(b),e=0;ethis.model.getChildCount(b)&&c--;console.log("b ---");console.log(b);console.log("a[l]");console.log(a[l]);console.log("c+l");console.log(c+l);this.model.add(b,a[l],c+l);this.autoSizeCellsOnAdd&&this.autoSizeCell(a[l],!0);(null==k||k)&&this.isExtendParentsOnAdd(a[l])&&this.isExtendParent(a[l])&&this.extendParent(a[l]);(null==g||g)&&this.constrainChild(a[l]);null!=d&&this.cellConnected(a[l],d,!0);null!=e&&this.cellConnected(a[l], -e,!1)}this.fireEvent(new mxEventObject(mxEvent.CELLS_ADDED,"cells",a,"parent",b,"index",c,"source",d,"target",e,"absolute",f))}finally{this.model.endUpdate()}}};mxGraph.prototype.autoSizeCell=function(a,b){if(null!=b?b:1){b=this.model.getChildCount(a);for(var c=0;cthis.model.getChildCount(b)&&c--;this.model.add(b,a[l],c+l);this.autoSizeCellsOnAdd&&this.autoSizeCell(a[l],!0);(null==k||k)&&this.isExtendParentsOnAdd(a[l])&&this.isExtendParent(a[l])&&this.extendParent(a[l]);(null==g||g)&&this.constrainChild(a[l]);null!=d&&this.cellConnected(a[l],d,!0);null!=e&&this.cellConnected(a[l],e,!1)}this.fireEvent(new mxEventObject(mxEvent.CELLS_ADDED,"cells",a,"parent",b,"index",c,"source", +d,"target",e,"absolute",f))}finally{this.model.endUpdate()}}};mxGraph.prototype.autoSizeCell=function(a,b){if(null!=b?b:1){b=this.model.getChildCount(a);for(var c=0;c { if (change instanceof mxValueChange && change.cell.isZone()) { const c = change.cell; - console.log('cell in handleZoneChanges:') - console.log(change) // if they just changed the label, update the internal label if (change.value.attributes.label.value !== change.previous.attributes.label.value) { - console.log('changes in zone') c.setAttribute('internalLabel', change.value.attributes.label.value); } diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Actions.js b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Actions.js index e64fa47619..af1ca5e7ff 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Actions.js +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Actions.js @@ -1266,8 +1266,6 @@ Actions.prototype.init = function() { this.analyzeToggled = !this.analyzeToggled; editor.analyzeDiagram = !editor.analyzeDiagram; - console.log('action:') - console.log(action) if (action.onToggle) { action.onToggle(this.analyzeToggled); diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Editor.js b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Editor.js index 77939d71b0..f0dc549644 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Editor.js +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Editor.js @@ -54,20 +54,11 @@ Editor = function (chromeless, themes, model, graph, editable) { } if (haschanges) { - console.log('in has changes, "this" before:') - console.log(this) CsetUtils.adjustConnectability(edit); CsetUtils.edgesToTop(this.graph, edit); CsetUtils.handleZoneChanges(edit); - //console.log('after a lot of stuff but before refresh') - - //console.log(this) this.graph.refresh(); - console.log('after refresh: ---------------------') - console.log(this) CsetUtils.PersistGraphToCSET(this); - console.log('after persistGraphToCset') - console.log(this) } }; diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Sidebar.js b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Sidebar.js index 221da38542..520e47c9a7 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Sidebar.js +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/grapheditor/Sidebar.js @@ -2213,7 +2213,6 @@ Sidebar.prototype.createDropHandler = function (cells, allowSplit, allowCellsIns select = clones; } else if (cells.length > 0) { - console.log('importing cells?') select = graph.importCells(cells, x, y, target); if (graph.model.isVertex(sourceCell) && select.length == 1 && diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/integrate.min.js b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/integrate.min.js index 1402bef1ca..ff8f586bee 100644 --- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/integrate.min.js +++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Diagram/src/main/webapp/js/integrate.min.js @@ -922,10 +922,9 @@ mxGraphModel.prototype.setCreateIds=function(a){this.createIds=a};mxGraphModel.p mxGraphModel.prototype.filterDescendants=function(a,b){var c=[];b=b||this.getRoot();(null==a||a(b))&&c.push(b);for(var d=this.getChildCount(b),e=0;ethis.model.getChildCount(b)&&c--;console.log("b ---");console.log(b);console.log("a[l]");console.log(a[l]);console.log("c+l");console.log(c+l);this.model.add(b,a[l],c+l);this.autoSizeCellsOnAdd&&this.autoSizeCell(a[l],!0);(null==k||k)&&this.isExtendParentsOnAdd(a[l])&&this.isExtendParent(a[l])&&this.extendParent(a[l]);(null==g||g)&&this.constrainChild(a[l]);null!=d&&this.cellConnected(a[l],d,!0);null!=e&&this.cellConnected(a[l], -e,!1)}this.fireEvent(new mxEventObject(mxEvent.CELLS_ADDED,"cells",a,"parent",b,"index",c,"source",d,"target",e,"absolute",f))}finally{this.model.endUpdate()}}};mxGraph.prototype.autoSizeCell=function(a,b){if(null!=b?b:1){b=this.model.getChildCount(a);for(var c=0;cthis.model.getChildCount(b)&&c--;this.model.add(b,a[l],c+l);this.autoSizeCellsOnAdd&&this.autoSizeCell(a[l],!0);(null==k||k)&&this.isExtendParentsOnAdd(a[l])&&this.isExtendParent(a[l])&&this.extendParent(a[l]);(null==g||g)&&this.constrainChild(a[l]);null!=d&&this.cellConnected(a[l],d,!0);null!=e&&this.cellConnected(a[l],e,!1)}this.fireEvent(new mxEventObject(mxEvent.CELLS_ADDED,"cells",a,"parent",b,"index",c,"source", +d,"target",e,"absolute",f))}finally{this.model.endUpdate()}}};mxGraph.prototype.autoSizeCell=function(a,b){if(null!=b?b:1){b=this.model.getChildCount(a);for(var c=0;cthis.model.getChildCount(b)&&c--;console.log("b ---");console.log(b);console.log("a[l]");console.log(a[l]);console.log("c+l");console.log(c+l);this.model.add(b,a[l],c+l);this.autoSizeCellsOnAdd&&this.autoSizeCell(a[l],!0);(null==k||k)&&this.isExtendParentsOnAdd(a[l])&&this.isExtendParent(a[l])&&this.extendParent(a[l]);(null==g||g)&&this.constrainChild(a[l]);null!=d&&this.cellConnected(a[l],d,!0);null!=e&&this.cellConnected(a[l], -e,!1)}this.fireEvent(new mxEventObject(mxEvent.CELLS_ADDED,"cells",a,"parent",b,"index",c,"source",d,"target",e,"absolute",f))}finally{this.model.endUpdate()}}};mxGraph.prototype.autoSizeCell=function(a,b){if(null!=b?b:1){b=this.model.getChildCount(a);for(var c=0;cthis.model.getChildCount(b)&&c--;this.model.add(b,a[l],c+l);this.autoSizeCellsOnAdd&&this.autoSizeCell(a[l],!0);(null==k||k)&&this.isExtendParentsOnAdd(a[l])&&this.isExtendParent(a[l])&&this.extendParent(a[l]);(null==g||g)&&this.constrainChild(a[l]);null!=d&&this.cellConnected(a[l],d,!0);null!=e&&this.cellConnected(a[l],e,!1)}this.fireEvent(new mxEventObject(mxEvent.CELLS_ADDED,"cells",a,"parent",b,"index",c,"source", +d,"target",e,"absolute",f))}finally{this.model.endUpdate()}}};mxGraph.prototype.autoSizeCell=function(a,b){if(null!=b?b:1){b=this.model.getChildCount(a);for(var c=0;cthis.model.getChildCount(b)&&c--;console.log("b ---");console.log(b);console.log("a[l]");console.log(a[l]);console.log("c+l");console.log(c+l);this.model.add(b,a[l],c+l);this.autoSizeCellsOnAdd&&this.autoSizeCell(a[l],!0);(null==k||k)&&this.isExtendParentsOnAdd(a[l])&&this.isExtendParent(a[l])&&this.extendParent(a[l]);(null==g||g)&&this.constrainChild(a[l]);null!=d&&this.cellConnected(a[l],d,!0);null!=e&&this.cellConnected(a[l], -e,!1)}this.fireEvent(new mxEventObject(mxEvent.CELLS_ADDED,"cells",a,"parent",b,"index",c,"source",d,"target",e,"absolute",f))}finally{this.model.endUpdate()}}};mxGraph.prototype.autoSizeCell=function(a,b){if(null!=b?b:1){b=this.model.getChildCount(a);for(var c=0;cthis.model.getChildCount(b)&&c--;this.model.add(b,a[l],c+l);this.autoSizeCellsOnAdd&&this.autoSizeCell(a[l],!0);(null==k||k)&&this.isExtendParentsOnAdd(a[l])&&this.isExtendParent(a[l])&&this.extendParent(a[l]);(null==g||g)&&this.constrainChild(a[l]);null!=d&&this.cellConnected(a[l],d,!0);null!=e&&this.cellConnected(a[l],e,!1)}this.fireEvent(new mxEventObject(mxEvent.CELLS_ADDED,"cells",a,"parent",b,"index",c,"source", +d,"target",e,"absolute",f))}finally{this.model.endUpdate()}}};mxGraph.prototype.autoSizeCell=function(a,b){if(null!=b?b:1){b=this.model.getChildCount(a);for(var c=0;c { - console.log('--- c ---') - console.log(c) this.cellClonedCSET(graph, c); }); } @@ -9929,10 +9923,6 @@ mxGraphModel.prototype.cellClonedCSET = function (graph, cell) { * CSET - things to do when new objects are added to the graph */ mxGraphModel.cellAddedCSET = function (graph, cell) { - console.log('-- cellAddedCSET --') - console.log('cell') - console.log(cell) - // get out if the new added cell is part of the sidebar. Sidebar graph doesn't appear to have a prefix attribute. if (!graph.prefix) { return; @@ -9940,7 +9930,6 @@ mxGraphModel.cellAddedCSET = function (graph, cell) { // no cell without a style needs to be considered for any of the logic below if (!cell.style) { - console.log('no style, bailing'); return; } @@ -10006,7 +9995,6 @@ mxGraphModel.cellAddedCSET = function (graph, cell) { // see what we get that has no filename if (!filename && cell.getStyleValue('zone') != '1') { - console.log('no image style'); cell.setStyle('image;image=img/cset/unknown.svg'); } } @@ -10396,8 +10384,6 @@ mxGraphModel.prototype.cloneCells = function (a, b, c, d) { for (f = 0; f < e.length; f++) null != e[f] && this.restoreClone(e[f], a[f], c); e.forEach(clone => { - console.log('clone:') - console.log(clone) this.cellClonedCSET(this, clone); }); @@ -11565,8 +11551,6 @@ mxGraphSelectionModel.prototype.getFirstSelectableCell = function (a) { }; mxGraphSelectionModel.prototype.addCell = function (a) { null != a && this.addCells([a]) - console.log('in addCell:') - console.log(a) }; mxGraphSelectionModel.prototype.addCells = function (a) { if (null != a) { @@ -13756,8 +13740,6 @@ mxGraph.prototype.updateSelection = function () { this.removeSelectionCells(b) }; mxGraph.prototype.processChange = function (a) { - console.log("in process change:") - console.log(a) if (a instanceof mxRootChange) this.clearSelection(), this.setDefaultParent(null), this.removeStateForCell(a.previous), this.resetViewOnRootChange && (this.view.scale = 1, this.view.translate.x = 0, this.view.translate.y = 0), this.fireEvent(new mxEventObject(mxEvent.ROOT)); else if (a instanceof mxChildChange) { var b = this.model.getParent(a.child); @@ -14438,12 +14420,6 @@ mxGraph.prototype.cellsAdded = function (a, b, c, d, e, f, g, k) { } } b == p && c + l > this.model.getChildCount(b) && c--; - console.log('b ---') - console.log(b) - console.log('a[l]') - console.log(a[l]) - console.log('c+l') - console.log(c+l) this.model.add(b, a[l], c + l); this.autoSizeCellsOnAdd && this.autoSizeCell(a[l], !0); (null == k || k) && this.isExtendParentsOnAdd(a[l]) && this.isExtendParent(a[l]) && this.extendParent(a[l]); @@ -14798,7 +14774,6 @@ mxGraph.prototype.extendParent = function (a) { } }; mxGraph.prototype.importCells = function (a, b, c, d, e, f) { - console.log('correct import!') return this.moveCells(a, b, c, !0, d, e, f) }; mxGraph.prototype.moveCells = function (a, b, c, d, e, f, g) { @@ -14806,27 +14781,8 @@ mxGraph.prototype.moveCells = function (a, b, c, d, e, f, g) { c = null != c ? c : 0; d = null != d ? d : !1; - console.log('a:') - console.log(a) - console.log('b:') - console.log(b) - console.log('c:') - console.log(c) - console.log('d:') - console.log(d) - console.log('e:') - console.log(e) - console.log('f:') - console.log(f) - console.log('g:') - console.log(g) if (null != a && (0 != b || 0 != c || d || null != e)) { - - - var k = a = this.model.getTopmostCells(a); - console.log('k') - console.log(k) this.model.beginUpdate(); try { for (var l = new mxDictionary, m = 0; m < a.length; m++) l.put(a[m], !0); @@ -14841,8 +14797,6 @@ mxGraph.prototype.moveCells = function (a, b, c, d, e, f, g) { for (m = 0; m < a.length; m++) { var q = this.getCellGeometry(a[m]), r = this.model.getParent(a[m]); - console.log('getCellGeo:') - console.log(q) null != q && q.relative && this.model.isEdge(r) && (n(this.model.getTerminal(r, !0)) || n(this.model.getTerminal(r, !1))) || p.push(a[m]) } @@ -14854,16 +14808,6 @@ mxGraph.prototype.moveCells = function (a, b, c, d, e, f, g) { this.setAllowNegativeCoordinates(t); if (null != e) { var u = this.model.getChildCount(e); - console.log('cellsAdded here') - - console.log('a') - console.log(a) - console.log('e') - - console.log(e) - console.log('u') - - console.log(u) this.cellsAdded(a, e, u, null, null, !0); @@ -14875,8 +14819,7 @@ mxGraph.prototype.moveCells = function (a, b, c, d, e, f, g) { this.model.endUpdate() } } - console.log('returning a:') - console.log(a) + return a }; mxGraph.prototype.cellsMoved = function (a, b, c, d, e, f) { @@ -16955,8 +16898,6 @@ mxSwimlaneManager.prototype.isCellHorizontal = function (a) { return this.graph.isSwimlane(a) ? (a = this.graph.getCellStyle(a), 1 == mxUtils.getValue(a, mxConstants.STYLE_HORIZONTAL, 1)) : !this.isHorizontal() }; mxSwimlaneManager.prototype.cellsAdded = function (a) { - console.log('in cellsAdded:') - console.log(a) if (null != a) { var b = this.getGraph().getModel(); b.beginUpdate(); @@ -18363,8 +18304,6 @@ mxConnectionHandler.prototype.connect = function (a, b, c, d) { g = null; e.beginUpdate(); try { - console.log('in connect a:') - console.log(a) if (null != a && null == b && !this.graph.isIgnoreTerminalEvent(c) && this.isCreateTarget(c) && (b = this.createTargetVertex(c, a), null != b)) { d = this.graph.getDropTarget([b], c, d); f = !0;