summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/awards_handler.js
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-03-07 15:25:27 -0600
committerEric Eastwood <contact@ericeastwood.com>2017-03-08 11:27:14 -0600
commitee9930145fafdd3869ecf985f0b2295081ac3c7e (patch)
treef7cfa42b679d813922d5ba0504517b25d0e9f625 /app/assets/javascripts/awards_handler.js
parent935574edd407ebb2f8aeeee2584da9b07850e813 (diff)
downloadgitlab-ce-ee9930145fafdd3869ecf985f0b2295081ac3c7e.tar.gz
Update emojis to use harmony modules (import/export)update-native-unicode-emojis-with-harmony-modules
Diffstat (limited to 'app/assets/javascripts/awards_handler.js')
-rw-r--r--app/assets/javascripts/awards_handler.js10
1 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 4667980a960..54836efdf29 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -1,10 +1,8 @@
/* global Cookies */
-const emojiMap = require('emoji-map');
-const emojiAliases = require('emoji-aliases');
-const glEmoji = require('./behaviors/gl_emoji');
-
-const glEmojiTag = glEmoji.glEmojiTag;
+import emojiMap from 'emojis/digests.json';
+import emojiAliases from 'emojis/aliases.json';
+import { glEmojiTag } from './behaviors/gl_emoji';
const animationEndEventString = 'animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd';
const requestAnimationFrame = window.requestAnimationFrame ||
@@ -515,4 +513,4 @@ AwardsHandler.prototype.destroy = function destroy() {
$('.emoji-menu').remove();
};
-module.exports = AwardsHandler;
+export default AwardsHandler;