diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-06-18 19:17:37 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-06-18 19:17:37 +0000 |
| commit | 69eff65130170c0cd8fffda45b952d3bec49c218 (patch) | |
| tree | c389a9fb5de43649e46335783f5c244d04100a5c /src/components/timeline/timeline.js | |
| parent | c0c012ccf9114fb5740dbaf41baa09c0d0c41ebc (diff) | |
| parent | 46e012206732f331a901eb1c4b90bab14d68d095 (diff) | |
Merge branch 'refactor-emoji-input' into 'develop'
EmojiInput refactoring
Closes #565
See merge request pleroma/pleroma-fe!824
Diffstat (limited to 'src/components/timeline/timeline.js')
| -rw-r--r-- | src/components/timeline/timeline.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 19d9a9ac..9dafcbd8 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -78,6 +78,8 @@ const Timeline = { }, methods: { handleShortKey (e) { + // Ignore when input fields are focused + if (['textarea', 'input'].includes(e.target.tagName.toLowerCase())) return if (e.key === '.') this.showNewStatuses() }, showNewStatuses () { |