From ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 17 Sep 2019 23:40:06 +0200 Subject: [PATCH] Fix composer dropdown toggle buttons (threaded mode and local-only) not working --- .../features/compose/components/dropdown_menu.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.js b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.js index 60fee9b7f9..404504e84b 100644 --- a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.js +++ b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.js @@ -77,9 +77,7 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent document.removeEventListener('touchend', this.handleDocumentClick, withPassive); } - handleClick = (e) => { - const name = e.currentTarget.getAttribute('data-index'); - + handleClick = (name, e) => { const { onChange, onClose, @@ -103,9 +101,8 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent } } - handleKeyDown = e => { + handleKeyDown = (name, e) => { const { items } = this.props; - const name = e.currentTarget.getAttribute('data-index'); const index = items.findIndex(item => { return (item.name === name); }); @@ -183,7 +180,7 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent let prefix = null; if (on !== null && typeof on !== 'undefined') { - prefix = ; + prefix = ; } else if (icon) { prefix = } @@ -191,8 +188,8 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent return (