From 707c3848ef6bb72c691f0a8cfd59ab222089d005 Mon Sep 17 00:00:00 2001 From: Zack Rauen Date: Thu, 8 Oct 2020 15:12:57 -0400 Subject: [PATCH] Fixes emote menu and typo --- src/builtins/emotes/emotemenu.js | 6 +++--- src/data/changelog.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/builtins/emotes/emotemenu.js b/src/builtins/emotes/emotemenu.js index 1c04b05e..b716b24b 100644 --- a/src/builtins/emotes/emotemenu.js +++ b/src/builtins/emotes/emotemenu.js @@ -16,8 +16,8 @@ export default new class EmoteMenu extends Builtin { if (props.expressionPickerView == "emoji" && this.hideEmojis) props.expressionPickerView = "gif"; }); this.after(EmojiPicker, "type", (_, [props], returnValue) => { - const head = Utilities.getNestedProp(returnValue, "props.children.props.children.1.props.children.0.props.children.props.children"); - const body = Utilities.getNestedProp(returnValue, "props.children.props.children.1.props.children"); + const head = Utilities.getNestedProp(returnValue, "props.children.props.children.props.children.1.props.children.0.props.children.props.children"); + const body = Utilities.getNestedProp(returnValue, "props.children.props.children.props.children.1.props.children"); if (!head || !body) return returnValue; const selected = props.expressionPickerView; @@ -36,7 +36,7 @@ export default new class EmoteMenu extends Builtin { }, e.label)) )); if (currentTab) body[2] = currentTab.element(); - if (this.hideEmojis) head.splice(head.findIndex(e=>e.props.id == "emoji-picker-tab"), 1); + if (this.hideEmojis) head.splice(head.findIndex(e => e && e.props && e.props.id == "emoji-picker-tab"), 1); }); } diff --git a/src/data/changelog.js b/src/data/changelog.js index e6187dd4..b8fd5487 100644 --- a/src/data/changelog.js +++ b/src/data/changelog.js @@ -7,7 +7,7 @@ export default { title: "What's New?", items: [ "**Everything** is entirely rewritten, for better or worse.", - "**Emotes and CustomCSS** can be completely turned off for those not interested. It saves on memory too but not loading those components.", + "**Emotes and CustomCSS** can be completely turned off for those not interested. It saves on memory too by not loading those components.", "**Floating editors** for both custom css and plugins/themes are now available. (See video above)", "**Settings panels** are completely new and sleek. They are also highly extensible for potential future features :eyes:", "**Translations** are now integrated starting with only a couple languages, but feel free to contribute your own!",