From 262760d2586cac48da27cf7eb5389116d4023dfe Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 10 Apr 2019 21:48:42 +0300 Subject: revert unnecessary changes --- src/components/emoji-input/emoji-input.js | 5 ++-- src/components/emoji-input/emoji-input.vue | 41 ++++++++++++++---------------- 2 files changed, 21 insertions(+), 25 deletions(-) (limited to 'src/components/emoji-input') diff --git a/src/components/emoji-input/emoji-input.js b/src/components/emoji-input/emoji-input.js index 64932f0e..a5bb6eaf 100644 --- a/src/components/emoji-input/emoji-input.js +++ b/src/components/emoji-input/emoji-input.js @@ -23,8 +23,7 @@ const EmojiInput = { if (matchedEmoji.length <= 0) { return false } - // eslint-disable-next-line camelcase - return map(take(matchedEmoji, 5), ({ shortcode, image_url, utf }, index) => ({ + return map(take(matchedEmoji, 5), ({shortcode, image_url, utf}, index) => ({ shortcode: `:${shortcode}:`, utf: utf || '', // eslint-disable-next-line camelcase @@ -99,7 +98,7 @@ const EmojiInput = { onInput (e) { this.$emit('input', e.target.value) }, - setCaret ({ target: { selectionStart } }) { + setCaret ({target: {selectionStart}}) { this.caret = selectionStart } } diff --git a/src/components/emoji-input/emoji-input.vue b/src/components/emoji-input/emoji-input.vue index 6a3be036..338b77cd 100644 --- a/src/components/emoji-input/emoji-input.vue +++ b/src/components/emoji-input/emoji-input.vue @@ -9,13 +9,13 @@ @input="onInput" @click="setCaret" @keyup="setCaret" - @keydown.exact="onKeydown" - @keydown.down.exact="cycleForward" - @keydown.up.exact="cycleBackward" - @keydown.shift.tab.exact="cycleBackward" - @keydown.tab.exact="cycleForward" - @keydown.enter.exact="replaceEmoji" - > + @keydown="onKeydown" + @keydown.down="cycleForward" + @keydown.up="cycleBackward" + @keydown.shift.tab="cycleBackward" + @keydown.tab="cycleForward" + @keydown.enter="replaceEmoji" + /> +
- + - {{ emoji.utf }} - {{ emoji.shortcode }} + {{emoji.utf}} + {{emoji.shortcode}}
-- cgit v1.2.3-70-g09d2