summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-06-23 13:26:59 -0500
committerMike Greiling <mike@pixelcog.com>2017-06-23 14:23:12 -0500
commit5a044dc25b1c04da6253577a3934e857a0c0bd0d (patch)
treefddf922f8de06807086c0105b60581892d4cb91d
parent1f3225a5e375b370e76c98e47e8ed0b8bc67eac8 (diff)
downloadgitlab-ce-5a044dc25b1c04da6253577a3934e857a0c0bd0d.tar.gz
refactor option defaults
-rw-r--r--app/assets/javascripts/behaviors/gl_emoji.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/behaviors/gl_emoji.js b/app/assets/javascripts/behaviors/gl_emoji.js
index 36ce4fddb72..ca6117c4fd6 100644
--- a/app/assets/javascripts/behaviors/gl_emoji.js
+++ b/app/assets/javascripts/behaviors/gl_emoji.js
@@ -25,12 +25,9 @@ function assembleFallbackImageSrc(inputName) {
return fallbackImageSrc;
}
-const glEmojiTagDefaults = {
- sprite: false,
- forceFallback: false,
-};
+
function glEmojiTag(inputName, options) {
- const opts = Object.assign({}, glEmojiTagDefaults, options);
+ const opts = { sprite: false, forceFallback: false, ...options };
let name = Object.prototype.hasOwnProperty.call(emojiAliases, inputName) ?
emojiAliases[inputName] : inputName;
let emojiInfo = emojiMap[name];