summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2017-08-18 03:18:10 +0300
committerFatih Acet <acetfatih@gmail.com>2017-08-18 03:18:10 +0300
commit200cc4f1679fc09684009113aa58b71f8b74544d (patch)
tree057b4e7f76c1c2eae3af7a6aad13e5de761bc987 /app
parent9a8654455f47623d64b9056445338d7a5781d686 (diff)
downloadgitlab-ce-200cc4f1679fc09684009113aa58b71f8b74544d.tar.gz
IssueNotesRefactor: Stop making request for disabled emojis.
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/awards_handler.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 023f3527309..4e00b02a17b 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -109,6 +109,7 @@ class AwardsHandler {
}
$thumbsBtn.toggleClass('disabled', $userAuthored);
+ $thumbsBtn.prop('disabled', $userAuthored);
}
// Create the emoji menu with the first category of emojis.
@@ -248,7 +249,7 @@ class AwardsHandler {
},
});
- document.querySelector('.js-vue-notes-event').dispatchEvent(toggleAwardEvent);
+ return document.querySelector('.js-vue-notes-event').dispatchEvent(toggleAwardEvent);
}
const normalizedEmoji = this.emoji.normalizeEmojiName(emoji);