summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-09-10 12:18:28 +0100
committerPhil Hughes <me@iamphill.com>2018-09-10 12:18:28 +0100
commitf378fa1838cf0ae1a1c4bfcd80688fde50848e16 (patch)
treee6609c5f952feef272103931552448936537b681
parent3d0baa0760ff079365680ed3aadaffe2a8280bc7 (diff)
downloadgitlab-ce-ph-eslint-disable-fixes.tar.gz
-rw-r--r--app/assets/javascripts/awards_handler.js5
-rw-r--r--app/assets/javascripts/behaviors/markdown/copy_as_gfm.js4
2 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 7e0c1971a15..db28606d855 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -286,7 +286,7 @@ export class AwardsHandler {
const normalizedEmoji = this.emoji.normalizeEmojiName(emoji);
const $emojiButton = AwardsHandler.findEmojiIcon(votesBlock, normalizedEmoji).parent();
- AwardsHandler.postEmoji($emojiButton, awardUrl, normalizedEmoji, () => {
+ this.postEmoji($emojiButton, awardUrl, normalizedEmoji, () => {
this.addAwardToEmojiBar(votesBlock, normalizedEmoji, checkMutuality);
return typeof callback === 'function' ? callback() : undefined;
});
@@ -460,7 +460,8 @@ export class AwardsHandler {
});
}
- static postEmoji($emojiButton, awardUrl, emoji, callback) {
+ // eslint-disable-next-line class-methods-use-this
+ postEmoji($emojiButton, awardUrl, emoji, callback) {
axios
.post(awardUrl, {
name: emoji,
diff --git a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
index 45d77ecd45d..8eabb589fc1 100644
--- a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
+++ b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js
@@ -150,9 +150,9 @@ export class CopyAsGFM {
return text;
}
- const gfmRuleValues = Object.values(gfmRules);
+ const gfmRuleValues = Object.keys(gfmRules);
for (let a = 0, gfmRuleValuesLength = gfmRuleValues.length; a < gfmRuleValuesLength; a += 1) {
- const rules = gfmRuleValues[a];
+ const rules = gfmRules[gfmRuleValues[a]];
const ruleKeys = Object.keys(rules);
for (let b = 0, ruleKeysLength = ruleKeys.length; b < ruleKeysLength; b += 1) {