mirror of
https://github.com/FrankerFaceZ/FrankerFaceZ.git
synced 2025-08-08 07:10:54 +00:00
4.20.73
* Added: Option for changing the chat timestamp font size. * Changed: Allow chat room actions to be spread across multiple lines. * Fixed: The chat action editor not properly displaying spacers. * Fixed: Make `switchboard` wait for `web_munch` before trying to load a route.
This commit is contained in:
parent
9086230686
commit
add9f7a7d5
11 changed files with 212 additions and 24 deletions
|
@ -193,15 +193,27 @@
|
|||
:key="idx"
|
||||
class="tw-flex tw-align-items-center tw-justify-content-center"
|
||||
>
|
||||
<action-preview
|
||||
v-for="act in actions"
|
||||
:key="act.id"
|
||||
:act="act.v"
|
||||
:color="color(act.v.appearance.color)"
|
||||
:renderers="data.renderers"
|
||||
tooltip="true"
|
||||
pad="true"
|
||||
/>
|
||||
<template v-for="act in actions">
|
||||
<div
|
||||
v-if="act.type === 'space'"
|
||||
:key="act.id"
|
||||
class="tw-flex-grow-1"
|
||||
/>
|
||||
<div
|
||||
v-else-if="act.type === 'space-small'"
|
||||
:key="act.id"
|
||||
class="tw-mg-x-1"
|
||||
/>
|
||||
<action-preview
|
||||
v-else
|
||||
:key="act.id"
|
||||
:act="act.v"
|
||||
:color="color(act.v.appearance.color)"
|
||||
:renderers="data.renderers"
|
||||
tooltip="true"
|
||||
pad="true"
|
||||
/>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -254,7 +266,7 @@
|
|||
<div v-else class="tw-pd-y-1">
|
||||
<button
|
||||
class="ffz-interactable ffz-interactable--hover-enabled ffz-interactable--default tw-interactive tw-full-width"
|
||||
@click="add_pasting = true"
|
||||
@click="preparePaste"
|
||||
>
|
||||
<div class="tw-flex tw-align-items-center tw-pd-y-05 tw-pd-x-1">
|
||||
<div class="tw-flex-grow-1 tw-mg-r-1">
|
||||
|
@ -532,6 +544,9 @@ export default {
|
|||
out.push(current);
|
||||
current = [];
|
||||
|
||||
} else if ( type === 'space' || type === 'small-space' ) {
|
||||
current.push(val.v);
|
||||
|
||||
} else if ( this.displayAction(val.v) )
|
||||
current.push(val);
|
||||
}
|
||||
|
@ -593,6 +608,14 @@ export default {
|
|||
this.add_pasting = false;
|
||||
},
|
||||
|
||||
preparePaste() {
|
||||
this.add_open = true;
|
||||
this.add_pasting = true;
|
||||
requestAnimationFrame(() => {
|
||||
this.$refs.paste.focus()
|
||||
});
|
||||
},
|
||||
|
||||
addFromJSON() {
|
||||
let value = this.$refs.paste.value;
|
||||
this.closeAdd();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue