From 1cf5a3d375a6df73feec7c3631ef1e00c94aa64f Mon Sep 17 00:00:00 2001 From: mrdrogdrog Date: Sun, 9 Aug 2020 10:15:58 +0200 Subject: [PATCH] Insert short code instead of native emoji (#397) --- .../editor/editor-window/tool-bar/utils.test.ts | 10 +++++----- src/components/editor/editor-window/tool-bar/utils.ts | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/editor/editor-window/tool-bar/utils.test.ts b/src/components/editor/editor-window/tool-bar/utils.test.ts index e09c4483f..455faa85e 100644 --- a/src/components/editor/editor-window/tool-bar/utils.test.ts +++ b/src/components/editor/editor-window/tool-bar/utils.test.ts @@ -1646,7 +1646,7 @@ describe('test addEmoji with native emoji', () => { const { cursor, firstLine, multiline, multilineOffset } = buildRanges() const textFirstLine = testContent.split('\n')[0] const emoji = Mock.of({ - native: '👍' + colons: ':+1:' }) it('just cursor', done => { Mock.extend(editor).with({ @@ -1661,7 +1661,7 @@ describe('test addEmoji with native emoji', () => { ), getLine: (): string => (textFirstLine), replaceRange: (replacement: string | string[]) => { - expect(replacement).toEqual('👍') + expect(replacement).toEqual(':+1:') done() } }) @@ -1683,7 +1683,7 @@ describe('test addEmoji with native emoji', () => { replaceRange: (replacement: string | string[], from: CodeMirror.Position, to?: CodeMirror.Position) => { expect(from).toEqual(firstLine.from) expect(to).toEqual(firstLine.to) - expect(replacement).toEqual('👍') + expect(replacement).toEqual(':+1:') done() } }) @@ -1705,7 +1705,7 @@ describe('test addEmoji with native emoji', () => { replaceRange: (replacement: string | string[], from: CodeMirror.Position, to?: CodeMirror.Position) => { expect(from).toEqual(multiline.from) expect(to).toEqual(multiline.to) - expect(replacement).toEqual('👍') + expect(replacement).toEqual(':+1:') done() } }) @@ -1727,7 +1727,7 @@ describe('test addEmoji with native emoji', () => { replaceRange: (replacement: string | string[], from: CodeMirror.Position, to?: CodeMirror.Position) => { expect(from).toEqual(multilineOffset.from) expect(to).toEqual(multilineOffset.to) - expect(replacement).toEqual('👍') + expect(replacement).toEqual(':+1:') done() } }) diff --git a/src/components/editor/editor-window/tool-bar/utils.ts b/src/components/editor/editor-window/tool-bar/utils.ts index 70a2bdf1b..7113fcd43 100644 --- a/src/components/editor/editor-window/tool-bar/utils.ts +++ b/src/components/editor/editor-window/tool-bar/utils.ts @@ -25,8 +25,8 @@ export const addTable = (editor: Editor): void => changeLines(editor, line => `$ export const addEmoji = (emoji: EmojiData, editor: Editor): void => { let replacement = '' - if ((emoji as BaseEmoji).native) { - replacement = (emoji as BaseEmoji).native + if ((emoji as BaseEmoji).colons) { + replacement = (emoji as BaseEmoji).colons } else if ((emoji as CustomEmoji).imageUrl) { // noinspection CheckTagEmptyBody replacement = ``