YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix history not displaying all messages when enlarged during an action

Browse source
This commit is contained in:
axolotle 2021-01-18 18:48:29 +01:00
parent 4b2bbfcad9
commit 2fbedbfd30
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/components/YnhConsole.vue
View file

@ -88,19 +88,23 @@ export default {
this.$nextTick(this.scrollToLastAction) this.$nextTick(this.scrollToLastAction)
}, },
waiting (value) { waiting (waiting) {
if (value && !this.open) { if (waiting && !this.open) {
// Open the history while waiting for the server's response to display WebSocket messages. // Open the history while waiting for the server's response to display WebSocket messages.
this.open = true this.open = true
this.openedByWaiting = true this.openedByWaiting = true
const history = this.$refs.history
this.$nextTick().then(() => { this.$nextTick().then(() => {
this.$refs.history.style.height = null history.style.height = ''
this.$refs.history.classList.add('with-max') history.classList.add('with-max')
}) })
} else if (!value && this.openedByWaiting) { } else if (!waiting && this.openedByWaiting) {
// Automaticly close the history if it was not opened before the request // Automaticly close the history if it was not opened before the request
setTimeout(() => { setTimeout(() => {
// Do not close it if the history was enlarged during the action
if (!history.style || history.style.height === '') {
this.open = false this.open = false
}
this.openedByWaiting = false this.openedByWaiting = false
}, 500) }, 500)
} }
@ -129,14 +133,19 @@ export default {
this.open = true this.open = true
} }
const currentHeight = history.offsetHeight const currentHeight = history.offsetHeight
const nextSize = currentHeight + (mousePos - clientY) const move = mousePos - clientY
const nextSize = currentHeight + move
if (nextSize < 10 && nextSize < currentHeight) { if (nextSize < 10 && nextSize < currentHeight) {
// Close the console and reset its size if the user reduce it to less than 10px. // Close the console and reset its size if the user reduce it to less than 10px.
mousePos = e.clientY mousePos = e.clientY
history.style.height = null history.style.height = ''
onMouseUp() onMouseUp()
} else { } else {
history.style.height = nextSize + 'px' history.style.height = nextSize + 'px'
// Simulate scroll when reducing the box so the content doesn't move
if (nextSize < currentHeight) {
history.scrollBy(0, -move)
}
mousePos = clientY mousePos = clientY
} }
} }
@ -211,7 +220,7 @@ export default {
// Used to display only the last message of the last action while an action is triggered // Used to display only the last message of the last action while an action is triggered
// and console was not opened. // and console was not opened.
&.show-last { &.with-max.show-last {
& > :not(:last-child) { & > :not(:last-child) {
display: none; display: none;
} }