1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-01 16:48:32 +00:00

4.0.0-rc21.4

* Fixed: Scrolling issue with the FFZ Control Center when using certain controls.
* Fixed: Visibility checkboxes in the In-Line Chat Actions editor not working correctly when multiple actions are in edit mode.
This commit is contained in:
SirStendec 2019-05-16 20:24:34 -04:00
parent 00d82c697f
commit 93f044a0e9
4 changed files with 30 additions and 9 deletions

View file

@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
FrankerFaceZ.Logger = Logger; FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = { const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc21.3', major: 4, minor: 0, revision: 0, extra: '-rc21.4',
commit: __git_commit__, commit: __git_commit__,
build: __webpack_hash__, build: __webpack_hash__,
toString: () => toString: () =>

View file

@ -129,56 +129,56 @@
<div class="ffz--inline tw-flex"> <div class="ffz--inline tw-flex">
<div class="tw-pd-r-1 tw-checkbox"> <div class="tw-pd-r-1 tw-checkbox">
<input <input
id="key_ctrl"
ref="key_ctrl" ref="key_ctrl"
:id="'key_ctrl$' + id"
:checked="edit_data.display.keys & 1" :checked="edit_data.display.keys & 1"
type="checkbox" type="checkbox"
class="tw-checkbox__input" class="tw-checkbox__input"
@change="onChangeKeys" @change="onChangeKeys"
> >
<label for="key_ctrl" class="tw-checkbox__label"> <label :for="'key_ctrl$' + id" class="tw-checkbox__label">
{{ t('setting.key.ctrl', 'Ctrl') }} {{ t('setting.key.ctrl', 'Ctrl') }}
</label> </label>
</div> </div>
<div class="tw-pd-r-1 tw-checkbox"> <div class="tw-pd-r-1 tw-checkbox">
<input <input
id="key_shift"
ref="key_shift" ref="key_shift"
:id="'key_shift$' + id"
:checked="edit_data.display.keys & 2" :checked="edit_data.display.keys & 2"
type="checkbox" type="checkbox"
class="tw-checkbox__input" class="tw-checkbox__input"
@change="onChangeKeys" @change="onChangeKeys"
> >
<label for="key_shift" class="tw-checkbox__label"> <label :for="'key_shift$' + id" class="tw-checkbox__label">
{{ t('setting.key.shift', 'Shift') }} {{ t('setting.key.shift', 'Shift') }}
</label> </label>
</div> </div>
<div class="tw-pd-r-1 tw-checkbox"> <div class="tw-pd-r-1 tw-checkbox">
<input <input
id="key_alt"
ref="key_alt" ref="key_alt"
:id="'key_alt$' + id"
:checked="edit_data.display.keys & 4" :checked="edit_data.display.keys & 4"
type="checkbox" type="checkbox"
class="tw-checkbox__input" class="tw-checkbox__input"
@change="onChangeKeys" @change="onChangeKeys"
> >
<label for="key_alt" class="tw-checkbox__label"> <label :for="'key_alt$' + id" class="tw-checkbox__label">
{{ t('setting.key.alt', 'Alt') }} {{ t('setting.key.alt', 'Alt') }}
</label> </label>
</div> </div>
<div class="tw-pd-r-1 tw-checkbox"> <div class="tw-pd-r-1 tw-checkbox">
<input <input
id="key_meta"
ref="key_meta" ref="key_meta"
:id="'key_meta$' + id"
:checked="edit_data.display.keys & 8" :checked="edit_data.display.keys & 8"
type="checkbox" type="checkbox"
class="tw-checkbox__input" class="tw-checkbox__input"
@change="onChangeKeys" @change="onChangeKeys"
> >
<label for="key_meta" class="tw-checkbox__label"> <label :for="'key_meta$' + id" class="tw-checkbox__label">
{{ t('setting.key.meta', 'Meta') }} {{ t('setting.key.meta', 'Meta') }}
</label> </label>
</div> </div>
@ -284,11 +284,14 @@
import {has, maybe_call, deep_copy} from 'utilities/object'; import {has, maybe_call, deep_copy} from 'utilities/object';
let id = 0;
export default { export default {
props: ['action', 'data', 'inline', 'context', 'modifiers'], props: ['action', 'data', 'inline', 'context', 'modifiers'],
data() { data() {
return { return {
id: id++,
deleting: false, deleting: false,
editing: false, editing: false,
edit_data: null edit_data: null

View file

@ -1,10 +1,12 @@
<template lang="html"> <template lang="html">
<div <div
ref="scroller"
:class="classes" :class="classes"
:data-simplebar-auto-hide="autoHide" :data-simplebar-auto-hide="autoHide"
:data-simplebar-scrollbar-min-size="scrollbarMinSize" :data-simplebar-scrollbar-min-size="scrollbarMinSize"
data-simplebar data-simplebar
class="scrollable-area" class="scrollable-area"
@scroll="onScroll"
> >
<div class="simplebar-scroll-content"> <div class="simplebar-scroll-content">
<div class="simplebar-content"> <div class="simplebar-content">
@ -27,6 +29,18 @@ export default {
type: Number, type: Number,
default: 10 default: 10
} }
},
methods: {
onScroll() {
// We do this to avoid the scroll position getting screwed up on
// an element that should never scroll. Thanks, web browsers.
const scroller = this.$refs.scroller;
if ( ! scroller || scroller.scrollTop == 0 )
return;
scroller.scrollTop = 0;
}
} }
} }

View file

@ -1,4 +1,8 @@
.ffz-main-menu { .ffz-main-menu {
.scrollable-area {
overflow-anchor: none;
}
& > header { & > header {
* { * {
pointer-events: none; pointer-events: none;