alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #406 from Gargron/revert-404-emoji 

Revert "Display native emoji on browsers which support it"
signup-info-prompt
Eugen 2017-01-05 13:45:37 +01:00 committed by GitHub
parent 87f76d4095 9e6ceb3201
commit 3354dc117b
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/components/emoji.jsx
View File

@ -1,18 +1,9 @@
import emojione from 'emojione';
import detectVersion from 'mojibaka';
emojione.imageType = 'png';
emojione.sprites = false;
emojione.imagePathPNG = '/emoji/';
let emoji_version = detectVersion();
export default function emojify(text) {
// Browser too old to support native emoji
if (emoji_version < 9.0) {
return emojione.toImage(text);
// Convert short codes into native emoji
} else {
return emojione.shortnameToUnicode(text);
}
return emojione.toImage(text);
};

1
package.json
View File

@ -26,7 +26,6 @@
"intl": "^1.2.5",
"jsdom": "^9.6.0",
"mocha": "^3.1.1",
"mojibaka": "^0.0.1",
"node-sass": "^4.0.0",
"react": "^15.3.2",
"react-addons-perf": "^15.3.2",

8
yarn.lock
View File

@ -2368,7 +2368,7 @@ glob-parent@^2.0.0:
dependencies:
is-glob "^2.0.0"
glob@7.0.5, glob@^7.0.0, glob@^7.0.3:
glob@7.0.5, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
version "7.0.5"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
dependencies:
@ -2389,7 +2389,7 @@ glob@^5.0.15:
once "^1.3.0"
path-is-absolute "^1.0.0"
glob@^7.0.5, glob@~7.1.1:
glob@~7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
dependencies:
@ -3392,10 +3392,6 @@ module-deps@^4.0.2:
through2 "^2.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:
version "0.7.1"
resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"