diff --git a/src/components/app/Popouts/Popouts/ServerSettingsPanels/DropDownMenu.vue b/src/components/app/Popouts/Popouts/ServerSettingsPanels/DropDownMenu.vue index f5329c2..eb26912 100644 --- a/src/components/app/Popouts/Popouts/ServerSettingsPanels/DropDownMenu.vue +++ b/src/components/app/Popouts/Popouts/ServerSettingsPanels/DropDownMenu.vue @@ -3,16 +3,26 @@
{{name}}
-
+
{{selectedItem ? selectedItemSorted.name : items[0].name}}
Select
expand_more
- +
-
+
{{item.name}}
@@ -25,60 +35,58 @@ import emojiParser from "@/utils/emojiParser.js"; export default { - props: ['items', 'name', 'selectedItem', 'noneSelect', 'selectBy'], // noneSelect: by default, nothing will be selected. + props: ["items", "name", "selectedItem", "noneSelect", "selectBy"], // noneSelect: by default, nothing will be selected. data() { return { dropped: false - } + }; }, methods: { itemClick(item) { - this.$emit('change', item) + this.$emit("change", item); }, documentClick(e) { const target = e.target; - const el = this.$refs.dropDown - if (((el !== target) && !el.contains(target)) && this.dropped) { - this.dropped = false; + const el = this.$refs.dropDown; + if (el !== target && !el.contains(target) && this.dropped) { + this.dropped = false; } - }, - + } }, created() { - document.addEventListener('click', this.documentClick); + document.addEventListener("click", this.documentClick); }, destroyed() { - document.removeEventListener('click', this.documentClick); + document.removeEventListener("click", this.documentClick); }, computed: { selectedItemSorted() { let item = null; - if (this.selectBy){ + if (this.selectBy) { item = this.items.find(i => i[this.selectBy] === this.selectedItem); } else { - item = this.selectedItem + item = this.selectedItem; } - if (item && item.emoji && !item.emoji.startsWith(' { - if (i && i.emoji && !i.emoji.startsWith(' diff --git a/src/components/app/Popouts/Popouts/ServerSettingsPanels/General.vue b/src/components/app/Popouts/Popouts/ServerSettingsPanels/General.vue index bd42e5f..2e4fda6 100644 --- a/src/components/app/Popouts/Popouts/ServerSettingsPanels/General.vue +++ b/src/components/app/Popouts/Popouts/ServerSettingsPanels/General.vue @@ -1,34 +1,52 @@