Skip to content

Commit 1992201

Browse files
committed
[Fix] Include '+' into emoji name regexp
1 parent daa9a0c commit 1992201

File tree

4 files changed

+15
-11
lines changed

4 files changed

+15
-11
lines changed

β€ŽCHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## [1.2.2] - 2018-02-18
8+
### Fixed
9+
- Include "+" (plus) sign to emoji regexp, which allows to use the "+1" emoji name.
10+
711
## [1.2.1] - 2018-02-17
812
### Fixed
913
- Bug with applying default skin tones to foregrounds / backgrounds consisting of

β€Žkrasivo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ var BACKGROUND_SYMBOL = '.'
55
var FOREGROUND_SYMBOL = '#'
66
var BACKGROUND_REGEXP = new RegExp('\\' + BACKGROUND_SYMBOL, 'g')
77
var FOREGROUND_REGEXP = new RegExp('\\' + FOREGROUND_SYMBOL, 'g')
8-
var EMOJI_WITH_SKIN_COLOUR_REGEXP = /:([\w-]+):(?::(skin-tone-\d):)?/g
9-
var EMOJI_NAME_REGEXP = /:([\w-]+):/g // word character, '_', or '-'
8+
var EMOJI_WITH_SKIN_COLOUR_REGEXP = /:([\+\w-]+):(?::(skin-tone-\d):)?/g
9+
var EMOJI_NAME_REGEXP = /:([\+\w-]+):/g // word character, '_', or '-'
1010
var isArray =
1111
Array.isArray || function (arg) { Object.prototype.toString.call(arg) === '[object Array]' }
1212
var arrayIncludes = Array.prototype.includes

β€Žkrasivo.test.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@ describe('krasivo', () => {
103103

104104
it('supports Slack skin tones', () => {
105105
expect(
106-
krasivo('lol', ':no_good::skin-tone-2:', ' ', { shortEmoji: true })
106+
krasivo('lol', ':+1::skin-tone-2:', ' ', { shortEmoji: true })
107107
).toBe(
108108
[
109-
'πŸ™…πŸ» πŸ™…πŸ»πŸ™…πŸ»πŸ™…πŸ» πŸ™…πŸ» ',
110-
'πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» ',
111-
'πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» ',
112-
'πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» ',
113-
'πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» ',
114-
'πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» πŸ™…πŸ» ',
115-
'πŸ™…πŸ»πŸ™…πŸ»πŸ™…πŸ»πŸ™…πŸ»πŸ™…πŸ» πŸ™…πŸ»πŸ™…πŸ»πŸ™…πŸ» πŸ™…πŸ»πŸ™…πŸ»πŸ™…πŸ»πŸ™…πŸ»πŸ™…πŸ»'
109+
'πŸ‘πŸ» πŸ‘πŸ»πŸ‘πŸ»πŸ‘πŸ» πŸ‘πŸ» ',
110+
'πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» ',
111+
'πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» ',
112+
'πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» ',
113+
'πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» ',
114+
'πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» πŸ‘πŸ» ',
115+
'πŸ‘πŸ»πŸ‘πŸ»πŸ‘πŸ»πŸ‘πŸ»πŸ‘πŸ» πŸ‘πŸ»πŸ‘πŸ»πŸ‘πŸ» πŸ‘πŸ»πŸ‘πŸ»πŸ‘πŸ»πŸ‘πŸ»πŸ‘πŸ»'
116116
].join('\n')
117117
)
118118
})

β€Žpackage.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "krasivo",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"author": "Alexander Komarov <ak@akxcv.com>",
55
"license": "MIT",
66
"keywords": [

0 commit comments

Comments
Β (0)