From 9108737d55300d8a4f822ba94335d8b53f04854d Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 7 Apr 2019 20:33:11 +0300 Subject: Webpack 4, ESLint with Vue, Node-sass, updated dependencies overall. New linting. --- src/components/emoji-input/emoji-input.js | 5 ++-- src/components/emoji-input/emoji-input.vue | 41 ++++++++++++++++-------------- 2 files changed, 25 insertions(+), 21 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 a5bb6eaf..64932f0e 100644 --- a/src/components/emoji-input/emoji-input.js +++ b/src/components/emoji-input/emoji-input.js @@ -23,7 +23,8 @@ const EmojiInput = { if (matchedEmoji.length <= 0) { return false } - return map(take(matchedEmoji, 5), ({shortcode, image_url, utf}, index) => ({ + // eslint-disable-next-line camelcase + return map(take(matchedEmoji, 5), ({ shortcode, image_url, utf }, index) => ({ shortcode: `:${shortcode}:`, utf: utf || '', // eslint-disable-next-line camelcase @@ -98,7 +99,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 338b77cd..6a3be036 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="onKeydown" - @keydown.down="cycleForward" - @keydown.up="cycleBackward" - @keydown.shift.tab="cycleBackward" - @keydown.tab="cycleForward" - @keydown.enter="replaceEmoji" - /> + @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.exact="onKeydown" + @keydown.down.exact="cycleForward" + @keydown.up.exact="cycleBackward" + @keydown.shift.tab.exact="cycleBackward" + @keydown.tab.exact="cycleForward" + @keydown.enter.exact="replaceEmoji" + /> +
- + - {{emoji.utf}} - {{emoji.shortcode}} + {{ emoji.utf }} + {{ emoji.shortcode }}
-- cgit v1.2.3-70-g09d2