Skip to content

Commit e4c691d

Browse files
committed
Merge branch 'master' into build
2 parents 6995c17 + e9a2486 commit e4c691d

File tree

5 files changed

+54
-37
lines changed

5 files changed

+54
-37
lines changed

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "emoji-mart-vue-fast",
3-
"version": "9.1.0",
3+
"version": "9.1.2",
44
"description": "Customizable Slack-like emoji picker for VueJS, fast version",
55
"main": "dist/emoji-mart.js",
66
"repository": {

scripts/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var fs = require('fs'),
22
emojiLib = require('emojilib'),
33
inflection = require('inflection')
44

5-
var { compress } = require('../src/utils/data')
5+
var { compress } = require('./compress')
66

77
var categories = [
88
['Smileys & Emotion', 'smileys'],

scripts/compress.js

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
const mapping = {
2+
name: 'a',
3+
unified: 'b',
4+
non_qualified: 'c',
5+
has_img_apple: 'd',
6+
has_img_google: 'e',
7+
has_img_twitter: 'f',
8+
has_img_facebook: 'h',
9+
keywords: 'j',
10+
sheet: 'k',
11+
emoticons: 'l',
12+
text: 'm',
13+
short_names: 'n',
14+
added_in: 'o',
15+
}
16+
17+
const compress = (emoji) => {
18+
emoji.short_names = emoji.short_names.filter((short_name) => {
19+
return short_name !== emoji.short_name
20+
})
21+
delete emoji.short_name
22+
23+
emoji.sheet = [emoji.sheet_x, emoji.sheet_y]
24+
delete emoji.sheet_x
25+
delete emoji.sheet_y
26+
27+
emoji.added_in = parseInt(emoji.added_in)
28+
if (emoji.added_in === 6) {
29+
delete emoji.added_in
30+
}
31+
32+
for (let key in mapping) {
33+
emoji[mapping[key]] = emoji[key]
34+
delete emoji[key]
35+
}
36+
37+
for (let key in emoji) {
38+
let value = emoji[key]
39+
40+
if (Array.isArray(value) && !value.length) {
41+
delete emoji[key]
42+
} else if (typeof value === 'string' && !value.length) {
43+
delete emoji[key]
44+
} else if (value === null) {
45+
delete emoji[key]
46+
}
47+
}
48+
}
49+
50+
module.exports = { compress }

src/utils/data.js

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -41,39 +41,6 @@ const buildSearch = (emoji) => {
4141
return search.join(',')
4242
}
4343

44-
const compress = (emoji) => {
45-
emoji.short_names = emoji.short_names.filter((short_name) => {
46-
return short_name !== emoji.short_name
47-
})
48-
delete emoji.short_name
49-
50-
emoji.sheet = [emoji.sheet_x, emoji.sheet_y]
51-
delete emoji.sheet_x
52-
delete emoji.sheet_y
53-
54-
emoji.added_in = parseInt(emoji.added_in)
55-
if (emoji.added_in === 6) {
56-
delete emoji.added_in
57-
}
58-
59-
for (let key in mapping) {
60-
emoji[mapping[key]] = emoji[key]
61-
delete emoji[key]
62-
}
63-
64-
for (let key in emoji) {
65-
let value = emoji[key]
66-
67-
if (Array.isArray(value) && !value.length) {
68-
delete emoji[key]
69-
} else if (typeof value === 'string' && !value.length) {
70-
delete emoji[key]
71-
} else if (value === null) {
72-
delete emoji[key]
73-
}
74-
}
75-
}
76-
7744
function deepFreeze(object) {
7845
// Retrieve the property names defined on object
7946
var propNames = Object.getOwnPropertyNames(object)
@@ -119,4 +86,4 @@ const uncompress = (data) => {
11986
return data
12087
}
12188

122-
module.exports = { buildSearch, compress, uncompress }
89+
export { buildSearch, uncompress }

0 commit comments

Comments
 (0)