Skip to content
Snippets Groups Projects
Commit 32897022 authored by Adam Procter's avatar Adam Procter
Browse files

Merge branch 'height3' into main

parents b8f4f82f 48d7a330
No related branches found
No related tags found
No related merge requests found
...@@ -313,14 +313,13 @@ export default { ...@@ -313,14 +313,13 @@ export default {
var zindexes = [] var zindexes = []
for (i = 0; i < Object.keys(this.configPositions).length; i++) { for (i = 0; i < Object.keys(this.configPositions).length; i++) {
//console.log(Math.max(...this.configPositions[i].z_index))
zindexes.push(this.configPositions[i].z_index) zindexes.push(this.configPositions[i].z_index)
if (this.configPositions[i].node_id == this.nodeid) { if (this.configPositions[i].node_id == this.nodeid) {
this.width = this.configPositions[i].width this.width = this.configPositions[i].width
this.height = this.configPositions[i].height this.height = this.configPositions[i].height
this.zindex = this.configPositions[i].z_index this.zindex = this.configPositions[i].z_index
} }
// console.log(Math.max(...zindexes)) // console.log(zindexes)
} }
var topZ = Math.max(...zindexes) var topZ = Math.max(...zindexes)
...@@ -369,12 +368,18 @@ export default { ...@@ -369,12 +368,18 @@ export default {
this.localy = y this.localy = y
}, },
onDragstop(x, y, width, height) { onDragstop(x, y, width, height) {
var nodecontentHeight = document.getElementById(this.nodeid).clientHeight
var localnodeid = this.nodeid var localnodeid = this.nodeid
var zindex var zindex
width = this.width width = this.width
height = this.height height = this.height
var i var i
// FIXME: What is this for loop doing ?? // FIXME: What is this for loop doing ??
if (nodecontentHeight > this.height) {
this.height = nodecontentHeight + 150
}
for (i = 0; i < Object.keys(this.configPositions).length; i++) { for (i = 0; i < Object.keys(this.configPositions).length; i++) {
if (this.configPositions[i].node_id == this.nodeid) { if (this.configPositions[i].node_id == this.nodeid) {
this.localx = this.configPositions[i].x_pos this.localx = this.configPositions[i].x_pos
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment