forked from asonix/mastodon
Merge pull request #404 from mistydemeo/emoji
Display native emoji on browsers which support it
This commit is contained in:
commit
c3c9879b5e
3 changed files with 17 additions and 3 deletions
|
@ -1,9 +1,18 @@
|
||||||
import emojione from 'emojione';
|
import emojione from 'emojione';
|
||||||
|
import detectVersion from 'mojibaka';
|
||||||
|
|
||||||
emojione.imageType = 'png';
|
emojione.imageType = 'png';
|
||||||
emojione.sprites = false;
|
emojione.sprites = false;
|
||||||
emojione.imagePathPNG = '/emoji/';
|
emojione.imagePathPNG = '/emoji/';
|
||||||
|
|
||||||
|
let emoji_version = detectVersion();
|
||||||
|
|
||||||
export default function emojify(text) {
|
export default function emojify(text) {
|
||||||
|
// Browser too old to support native emoji
|
||||||
|
if (emoji_version < 9.0) {
|
||||||
return emojione.toImage(text);
|
return emojione.toImage(text);
|
||||||
|
// Convert short codes into native emoji
|
||||||
|
} else {
|
||||||
|
return emojione.shortnameToUnicode(text);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
"intl": "^1.2.5",
|
"intl": "^1.2.5",
|
||||||
"jsdom": "^9.6.0",
|
"jsdom": "^9.6.0",
|
||||||
"mocha": "^3.1.1",
|
"mocha": "^3.1.1",
|
||||||
|
"mojibaka": "^0.0.1",
|
||||||
"node-sass": "^4.0.0",
|
"node-sass": "^4.0.0",
|
||||||
"react": "^15.3.2",
|
"react": "^15.3.2",
|
||||||
"react-addons-perf": "^15.3.2",
|
"react-addons-perf": "^15.3.2",
|
||||||
|
|
|
@ -2368,7 +2368,7 @@ glob-parent@^2.0.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
is-glob "^2.0.0"
|
is-glob "^2.0.0"
|
||||||
|
|
||||||
glob@7.0.5, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
|
glob@7.0.5, glob@^7.0.0, glob@^7.0.3:
|
||||||
version "7.0.5"
|
version "7.0.5"
|
||||||
resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
|
resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
|
||||||
dependencies:
|
dependencies:
|
||||||
|
@ -2389,7 +2389,7 @@ glob@^5.0.15:
|
||||||
once "^1.3.0"
|
once "^1.3.0"
|
||||||
path-is-absolute "^1.0.0"
|
path-is-absolute "^1.0.0"
|
||||||
|
|
||||||
glob@~7.1.1:
|
glob@^7.0.5, glob@~7.1.1:
|
||||||
version "7.1.1"
|
version "7.1.1"
|
||||||
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
|
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
|
||||||
dependencies:
|
dependencies:
|
||||||
|
@ -3392,6 +3392,10 @@ module-deps@^4.0.2:
|
||||||
through2 "^2.0.0"
|
through2 "^2.0.0"
|
||||||
xtend "^4.0.0"
|
xtend "^4.0.0"
|
||||||
|
|
||||||
|
mojibaka@^0.0.1:
|
||||||
|
version "0.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/mojibaka/-/mojibaka-0.0.1.tgz#54b0690d9149bbdf97f13b909f2417c53b8d52e5"
|
||||||
|
|
||||||
ms@0.7.1:
|
ms@0.7.1:
|
||||||
version "0.7.1"
|
version "0.7.1"
|
||||||
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
|
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
|
||||||
|
|
Loading…
Reference in a new issue