From 93ecc9839bfe3a157e2760b2e1106b06a76bf146 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 22 Oct 2019 13:49:02 +0100 Subject: [PATCH 1/2] Fix linty failures --- .../views/elements/EventListSummary.js | 2 +- .../views/emojipicker/EmojiPicker.js | 4 +-- src/components/views/emojipicker/Preview.js | 4 +-- .../views/emojipicker/QuickReactions.js | 4 +-- .../views/emojipicker/ReactionPicker.js | 13 +++++--- .../views/messages/MessageActionBar.js | 1 - src/editor/deserialize.js | 2 +- src/i18n/strings/en_EN.json | 32 ++++++++----------- 8 files changed, 29 insertions(+), 33 deletions(-) diff --git a/src/components/views/elements/EventListSummary.js b/src/components/views/elements/EventListSummary.js index d6971334d4..79712ebb45 100644 --- a/src/components/views/elements/EventListSummary.js +++ b/src/components/views/elements/EventListSummary.js @@ -29,7 +29,7 @@ const EventListSummary = ({events, children, threshold=3, onToggle, startExpande if (onToggle) { onToggle(); } - }, [expanded]); + }, [expanded]); // eslint-disable-line react-hooks/exhaustive-deps const eventIds = events.map((e) => e.getId()).join(','); diff --git a/src/components/views/emojipicker/EmojiPicker.js b/src/components/views/emojipicker/EmojiPicker.js index 6bf79d2623..6d34804187 100644 --- a/src/components/views/emojipicker/EmojiPicker.js +++ b/src/components/views/emojipicker/EmojiPicker.js @@ -218,8 +218,8 @@ class EmojiPicker extends React.Component { const QuickReactions = sdk.getComponent("emojipicker.QuickReactions"); return (
-
- +
+
{this.categories.map(category => ( @@ -42,7 +42,7 @@ class Preview extends React.PureComponent {
- ) + ); } } diff --git a/src/components/views/emojipicker/QuickReactions.js b/src/components/views/emojipicker/QuickReactions.js index 820865dc88..66248730f9 100644 --- a/src/components/views/emojipicker/QuickReactions.js +++ b/src/components/views/emojipicker/QuickReactions.js @@ -74,10 +74,10 @@ class QuickReactions extends React.Component { {QUICK_REACTIONS.map(emoji => )} + selectedEmojis={this.props.selectedEmojis} />)} - ) + ); } } diff --git a/src/components/views/emojipicker/ReactionPicker.js b/src/components/views/emojipicker/ReactionPicker.js index d027ae6fd3..01c04529ed 100644 --- a/src/components/views/emojipicker/ReactionPicker.js +++ b/src/components/views/emojipicker/ReactionPicker.js @@ -79,11 +79,11 @@ class ReactionPicker extends React.Component { return Object.fromEntries([...myAnnotations] .filter(event => !event.isRedacted()) .map(event => [event.getRelation().key, event.getId()])); - }; + } onReactionsChange() { this.setState({ - selectedEmojis: new Set(Object.keys(this.getReactions())) + selectedEmojis: new Set(Object.keys(this.getReactions())), }); } @@ -112,9 +112,12 @@ class ReactionPicker extends React.Component { } render() { - return + return ; } } -export default ReactionPicker +export default ReactionPicker; diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js index df1bc9a294..565c66410e 100644 --- a/src/components/views/messages/MessageActionBar.js +++ b/src/components/views/messages/MessageActionBar.js @@ -25,7 +25,6 @@ import Modal from '../../../Modal'; import { createMenu } from '../../structures/ContextualMenu'; import { isContentActionable, canEditContent } from '../../../utils/EventUtils'; import {RoomContext} from "../../structures/RoomView"; -import MatrixClientPeg from '../../../MatrixClientPeg'; export default class MessageActionBar extends React.PureComponent { static propTypes = { diff --git a/src/editor/deserialize.js b/src/editor/deserialize.js index 6636c9971e..1fdbf9490c 100644 --- a/src/editor/deserialize.js +++ b/src/editor/deserialize.js @@ -109,7 +109,7 @@ function parseElement(n, partCreator, lastNode, state) { const indent = " ".repeat(state.listDepth - 1); if (n.parentElement.nodeName === "OL") { // The markdown parser doesn't do nested indexed lists at all, but this supports it anyway. - let index = state.listIndex[state.listIndex.length - 1]; + const index = state.listIndex[state.listIndex.length - 1]; state.listIndex[state.listIndex.length - 1] += 1; return partCreator.plain(`${indent}${index}. `); } else { diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index e5c6043c7f..2683d6f10a 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1045,6 +1045,7 @@ "Yesterday": "Yesterday", "View Source": "View Source", "Error decrypting audio": "Error decrypting audio", + "React": "React", "Reply": "Reply", "Edit": "Edit", "Options": "Options", @@ -1056,12 +1057,6 @@ "Error decrypting image": "Error decrypting image", "Show image": "Show image", "Error decrypting video": "Error decrypting video", - "Agree": "Agree", - "Disagree": "Disagree", - "Happy": "Happy", - "Party Popper": "Party Popper", - "Confused": "Confused", - "Eyes": "Eyes", "Show all": "Show all", "reacted with %(shortName)s": "reacted with %(shortName)s", "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s", @@ -1113,6 +1108,17 @@ "Checking for an update...": "Checking for an update...", "No update available.": "No update available.", "Downloading update...": "Downloading update...", + "Frequently Used": "Frequently Used", + "Smileys & People": "Smileys & People", + "Animals & Nature": "Animals & Nature", + "Food & Drink": "Food & Drink", + "Activities": "Activities", + "Travel & Places": "Travel & Places", + "Objects": "Objects", + "Symbols": "Symbols", + "Flags": "Flags", + "Quick Reactions": "Quick Reactions", + "Cancel search": "Cancel search", "Unknown Address": "Unknown Address", "NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted", "Warning: This widget might use cookies.": "Warning: This widget might use cookies.", @@ -1839,17 +1845,5 @@ "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.": "If you didn't remove the recovery method, an attacker may be trying to access your account. Change your account password and set a new recovery method immediately in Settings.", "Failed to set direct chat tag": "Failed to set direct chat tag", "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room", - "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room", - "Quick Reactions": "Quick Reactions", - "Frequently Used": "Frequently Used", - "Smileys & People": "Smileys & People", - "Animals & Nature": "Animals & Nature", - "Food & Drink": "Food & Drink", - "Activities": "Activities", - "Travel & Places": "Travel & Places", - "Objects": "Objects", - "Symbols": "Symbols", - "Flags": "Flags", - "React": "React", - "Cancel search": "Cancel search" + "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room" } From 190fccea151e0af64fe019208e950e89127a4527 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 22 Oct 2019 16:35:36 +0100 Subject: [PATCH 2/2] delint scss --- res/css/views/emojipicker/_EmojiPicker.scss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/res/css/views/emojipicker/_EmojiPicker.scss b/res/css/views/emojipicker/_EmojiPicker.scss index 6dcc4d75b9..8f57d97833 100644 --- a/res/css/views/emojipicker/_EmojiPicker.scss +++ b/res/css/views/emojipicker/_EmojiPicker.scss @@ -70,16 +70,16 @@ limitations under the License. background-color: $focus-bg-color; } -.mx_EmojiPicker_anchor_activity::before { mask-image: url('$(res)/img/emojipicker/activity.svg') } -.mx_EmojiPicker_anchor_custom::before { mask-image: url('$(res)/img/emojipicker/custom.svg') } -.mx_EmojiPicker_anchor_flags::before { mask-image: url('$(res)/img/emojipicker/flags.svg') } -.mx_EmojiPicker_anchor_foods::before { mask-image: url('$(res)/img/emojipicker/foods.svg') } -.mx_EmojiPicker_anchor_nature::before { mask-image: url('$(res)/img/emojipicker/nature.svg') } -.mx_EmojiPicker_anchor_objects::before { mask-image: url('$(res)/img/emojipicker/objects.svg') } -.mx_EmojiPicker_anchor_people::before { mask-image: url('$(res)/img/emojipicker/people.svg') } -.mx_EmojiPicker_anchor_places::before { mask-image: url('$(res)/img/emojipicker/places.svg') } -.mx_EmojiPicker_anchor_recent::before { mask-image: url('$(res)/img/emojipicker/recent.svg') } -.mx_EmojiPicker_anchor_symbols::before { mask-image: url('$(res)/img/emojipicker/symbols.svg') } +.mx_EmojiPicker_anchor_activity::before { mask-image: url('$(res)/img/emojipicker/activity.svg'); } +.mx_EmojiPicker_anchor_custom::before { mask-image: url('$(res)/img/emojipicker/custom.svg'); } +.mx_EmojiPicker_anchor_flags::before { mask-image: url('$(res)/img/emojipicker/flags.svg'); } +.mx_EmojiPicker_anchor_foods::before { mask-image: url('$(res)/img/emojipicker/foods.svg'); } +.mx_EmojiPicker_anchor_nature::before { mask-image: url('$(res)/img/emojipicker/nature.svg'); } +.mx_EmojiPicker_anchor_objects::before { mask-image: url('$(res)/img/emojipicker/objects.svg'); } +.mx_EmojiPicker_anchor_people::before { mask-image: url('$(res)/img/emojipicker/people.svg'); } +.mx_EmojiPicker_anchor_places::before { mask-image: url('$(res)/img/emojipicker/places.svg'); } +.mx_EmojiPicker_anchor_recent::before { mask-image: url('$(res)/img/emojipicker/recent.svg'); } +.mx_EmojiPicker_anchor_symbols::before { mask-image: url('$(res)/img/emojipicker/symbols.svg'); } .mx_EmojiPicker_anchor_visible { border-bottom: 2px solid $button-bg-color;