oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-01 08:38:32 +00:00
Code Wiki Activity

4.0.0-rc21

Browse source 
* Added: In-Line Chat Actions can now be set to display with specific modifier keys being held. This feature currently requires that Freeze Chat Scrolling is enabled. (Though, why you'd want to use this without that feature is beyond me.)
* Fixed: Bug with custom chat width in theater mode.
* Fixed: The `Get Bits` button appearing when disabled.
* Fixed: Issue with highlighting chat usernames when using Firefox.
* Fixed: Misc minor bugs.
This commit is contained in:
SirStendec 2019-05-16 14:46:26 -04:00
parent 63783472b7
commit bd11a6f2aa
16 changed files with 299 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

111
src/modules/main_menu/components/action-editor.vue
View file

@ -119,6 +119,76 @@
<option :value="false">{{ t('setting.false', 'False') }}</option>
</select>
</div>
<div v-if="has_modifiers" class="tw-flex tw-align-items-start">
<label for="vis_modifiers">
{{ t('setting.actions.edit-visible.modifier', 'Modifiers') }}
</label>
<div>
<div class="ffz--inline tw-flex">
<div class="tw-pd-r-1 tw-checkbox">
<input
id="key_ctrl"
ref="key_ctrl"
:checked="edit_data.display.keys & 1"
type="checkbox"
class="tw-checkbox__input"
@change="onChangeKeys"
>
<label for="key_ctrl" class="tw-checkbox__label">
{{ t('setting.key.ctrl', 'Ctrl') }}
</label>
</div>
<div class="tw-pd-r-1 tw-checkbox">
<input
id="key_shift"
ref="key_shift"
:checked="edit_data.display.keys & 2"
type="checkbox"
class="tw-checkbox__input"
@change="onChangeKeys"
>
<label for="key_shift" class="tw-checkbox__label">
{{ t('setting.key.shift', 'Shift') }}
</label>
</div>
<div class="tw-pd-r-1 tw-checkbox">
<input
id="key_alt"
ref="key_alt"
:checked="edit_data.display.keys & 4"
type="checkbox"
class="tw-checkbox__input"
@change="onChangeKeys"
>
<label for="key_alt" class="tw-checkbox__label">
{{ t('setting.key.alt', 'Alt') }}
</label>
</div>
<div class="tw-pd-r-1 tw-checkbox">
<input
id="key_meta"
ref="key_meta"
:checked="edit_data.display.keys & 8"
type="checkbox"
class="tw-checkbox__input"
@change="onChangeKeys"
>
<label for="key_meta" class="tw-checkbox__label">
{{ t('setting.key.meta', 'Meta') }}
</label>
</div>
</div>
<div class="tw-pd-t-05">
Note: This currently requires Chat > Behavior > Freeze Chat Scrolling to be enabled.
</div>
</div>
</div>
</section>
<section class="tw-mg-t-1 tw-border-t tw-pd-t-1">
@ -215,7 +285,7 @@
import {has, maybe_call, deep_copy} from 'utilities/object';
export default {
props: ['action', 'data', 'inline', 'context'],
props: ['action', 'data', 'inline', 'context', 'modifiers'],
data() {
return {
@ -237,6 +307,10 @@ export default {
return this.context && this.context.includes('message')
},
has_modifiers() {
return this.modifiers
},
vars() {
const out = [],
ctx = this.context || [];
@ -373,6 +447,24 @@ export default {
else if ( disp.deleted === false )
out.push(this.t('setting.actions.visible.undeleted', 'if message not deleted'));
if ( disp.keys ) {
const key_out = [];
if ( disp.keys & 1 )
key_out.push(this.t('setting.key.ctrl', 'Ctrl'));
if ( disp.keys & 2 )
key_out.push(this.t('setting.key.shift', 'Shift'));
if ( disp.keys & 4 )
key_out.push(this.t('setting.key.alt', 'Alt'));
if ( disp.keys & 8 )
key_out.push(this.t('setting.key.meta', 'Meta'));
if ( key_out.length )
out.push(this.t('setting.actions.visible.modifier', 'when {key_list} {keys, plural, one {is} other {are}} held', {
key_list: key_out.join(' + '),
keys: key_out.length
}));
}
if ( ! out.length )
return this.t('setting.actions.visible.always', 'always');
@ -392,6 +484,23 @@ export default {
this.edit_data.options = val;
},
onChangeKeys() {
if ( ! this.editing )
return;
let i = 0;
if ( this.$refs.key_ctrl.checked )
i |= 1;
if ( this.$refs.key_shift.checked )
i |= 2;
if ( this.$refs.key_alt.checked )
i |= 4;
if ( this.$refs.key_meta.checked )
i |= 8;
this.edit_data.display.keys = i;
},
edit() {
if ( ! this.canEdit )
return;