lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Correct targeting

This commit is contained in:
Jiiks 2018-08-22 16:55:25 +03:00
parent f315c8b134
commit 1ab52cb174
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/builtin/EmoteModule.js
View File

@ -60,8 +60,8 @@ export default new class EmoteModule extends BuiltinModule {
{
text: 'Favourite',
type: 'toggle',
checked: false,
onChange: (checked, target) => { console.log(target); return checked; }
checked: (target) => { console.log(target); if (target.alt && target.alt === ';cirThree;') { console.log('yes'); return true; } else return false; },
onChange: (checked, target) => { if (target.alt && target.alt === ';cirThree;') { console.log('yes'); return true; } else return false; }
}
], filter => filter.closest('.bd-emote'));

6
client/src/ui/components/contextmenu/Group.vue
View File

@ -12,14 +12,14 @@
<div class="bd-cmGroup" ref="test">
<template v-for="(item, index) in items">
<CMButton v-if="!item.type || item.type === 'button'" :item="item" :onClick="() => { item.onClick(); closeMenu(); }" />
<CMToggle v-else-if="item.type === 'toggle'" :item="item" :onClick="() => { item.checked = item.onChange(!item.checked, target) }"/>
<CMToggle v-else-if="item.type === 'toggle'" :item="item" :checked="typeof item.checked === 'function' ? item.checked(target) : item.checked" :onClick="() => { }" />
<div v-else-if="item.type === 'sub'" class="bd-cmItem bd-cmSub" @mouseenter="e => subMenuMouseEnter(e, index, item)" @mouseleave="e => subMenuMouseLeave(e, index, item)">
{{item.text}}
<MiChevronDown />
<div ref="test2" class="bd-cm" v-if="index === visibleSub" :style="subStyle">
<template v-for="(item, index) in item.items">
<CMButton v-if="!item.type || item.type === 'button'" :item="item" :onClick="() => { item.onClick(); closeMenu(); }" />
<CMToggle v-else-if="item.type === 'toggle'" :item="item" :onClick="() => { item.checked = item.onChange(!item.checked) }" />
<CMToggle v-else-if="item.type === 'toggle'" :item="item" :checked="typeof item.checked === 'function' ? item.checked(target) : item.checked" :onClick="() => { }" />
</template>
</div>
</div>
@ -57,3 +57,5 @@
}
}
</script>
// return typeof this.item.checked === 'function' ? this.item.checked(target) : this.item.checked;

6
client/src/ui/components/contextmenu/Toggle.vue
View File

@ -11,9 +11,9 @@
<template>
<div class="bd-cmItem bd-cmToggle" @click="onClick">
<div class="bd-cmLabel">{{item.text}}</div>
<div class="bd-cmCheckbox">
<div class="bd-cmCheckbox" :checked="checked">
<div class="bd-cmCheckboxInner">
<input type="checkbox" :checked="item.checked || item.enabled"/>
<input type="checkbox" :checked="checked"/>
<span></span>
</div>
</div>
@ -22,6 +22,6 @@
<script>
export default {
props: ['item', 'onClick']
props: ['item', 'onClick', 'checked']
}
</script>

3
client/src/ui/contextmenus.js
View File

@ -66,11 +66,12 @@ export class DiscordContextMenu {
static renderCm(component, args, retVal, res) {
if (!retVal.props || !res.props) return;
const { target } = res.props;
const { target } = component.props;
const { top, left } = retVal.props.style;
if (!target || !top || !left) return;
if (!retVal.props.children) return;
if (!(retVal.props.children instanceof Array)) retVal.props.children = [retVal.props.children];
for (const menu of this.menus.filter(menu => { if (!menu.filter) return true; return menu.filter(target)})) {
retVal.props.children.push(VueInjector.createReactElement(CMGroup, {
target,